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

xiaoyong931011

2022-07-07 50a170ab1b38e97063e7a32da51e07b939638e8d

 src/main/resources/mapper/UserMapper.xml

@@ -11,7 +11,7 @@
        <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})
            WHERE b.role_id in ( SELECT id FROM t_role WHERE role_id = #{record.roleId})
            )
            <if test="record != null" >
                <if test="record.username!=null">