Merge remote-tracking branch 'origin/master'

fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -152,9 +152,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId != null and deptId != 0">
             AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{deptId}, ancestors) ))
         </if>
-        GROUP BY u.user_id
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        GROUP BY u.user_id
     </select>
 
 <!--    <select id="selectCompanyUserQwListVO" resultMap="CompanyUserQwListVOResult">-->