Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-06-24 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813

 src/main/resources/mapper/UserMapper.xml

@@ -7,7 +7,7 @@
        a.*
        FROM
        t_user a
        left join t_belong b on a.belong_id = b.id
        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
@@ -17,8 +17,8 @@
                <if test="record.username!=null">
                    and a.username like concat ('%',#{record.username},'%')
                </if>
                <if test="record.belongId!=null">
                    and a.belong_id = #{record.belongId}
                <if test="record.companyId!=null">
                    and a.company_id = #{record.companyId}
                </if>
            </if>
        </where>