根据角色权限查找人员优化

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -415,22 +415,6 @@
 
     <select id="findSysUserResultListNew" resultType="com.qmth.teachcloud.common.bean.result.SysUserResult">
         select
-<<<<<<< HEAD
-                     su.id as id,
-                     su.login_name as loginName,
-                     su.real_name as realName,
-                     su.mobile_number as mobileNumber,
-                     so.id as orgId,
-                     group_concat(CONCAT(sr.id, ",", sr.name) SEPARATOR ';') as roleIds
-        from
-            sys_user su
-                join sys_org so on
-                so.id = su.org_id
-                join sys_user_role sur on
-                sur.user_id = su.id
-                join sys_role sr on
-                sr.id = sur.role_id
-=======
         su.id as id,
         su.login_name as loginName,
         su.real_name as realName,
@@ -445,7 +429,6 @@
         sur.user_id = su.id
         join sys_role sr on
         sr.id = sur.role_id
->>>>>>> dev_v3.2.2
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and su.school_id = #{schoolId}
@@ -458,15 +441,6 @@
             </if>
         </where>
         group by
-<<<<<<< HEAD
-            su.id,
-            su.login_name,
-            su.real_name,
-            su.mobile_number,
-            so.id
-        order by
-            su.login_name
-=======
         su.id,
         su.login_name,
         su.real_name,
@@ -474,6 +448,5 @@
         so.id
         order by
         su.login_name
->>>>>>> dev_v3.2.2
     </select>
 </mapper>