fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

 src/main/resources/mapper/UserMapper.xml

@@ -7,11 +7,19 @@
        a.*
        FROM
        t_user a
        left join t_company b on a.company_id = b.id
        <where>
            and a.id not in (
            SELECT b.user_id FROM t_user_role b
            WHERE b.role_id = ( SELECT id FROM t_role WHERE role_name = #{record.roleName})
            )
            <if test="record != null" >
                <if test="record.username!=null">
                    and a.username like concat ('%',#{record.username},'%')
                </if>
                <if test="record.companyId!=null">
                    and a.company_id = #{record.companyId}
                </if>
            </if>
        </where>
        order by a.create_time desc