update

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java

@@ -1966,7 +1966,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public PageData<UserStandaeBearerPage> partyMenFlagReviewPage(Map<String, Object> params) {
         this.verifyParams(params);
         // 查询当前用户所具有的的数据权限
-        params.put("userId", SecurityUser.getUser().getId());
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
         IPage<UserStandaeBearerPage> iPage = this.getPage(params);
         List<UserStandaeBearerPage> list = this.baseDao.partyMenFlagReviewPage(params);
         return new PageData<>(list, iPage.getTotal());
@@ -1984,7 +1984,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public PageData<UserStandaeBearerPage> brightFlagPartyMem(Map<String, Object> params) {
         this.verifyParams(params);
         // 查询当前用户所具有的的数据权限
-        params.put("userId", SecurityUser.getUser().getId());
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
         IPage<UserStandaeBearerPage> iPage = this.getPage(params);
         List<UserStandaeBearerPage> list = this.baseDao.brightFlagPartyMem(params);
         return new PageData<>(list, iPage.getTotal());

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -1800,27 +1800,29 @@
         SELECT
             u.REAL_NAME,
             u.MOBILE,
-            u.ALL_DEPT_NAMES,
+            a.ALL_DEPT_NAMES,
             u.IDENTITY_NO,
             u.address,
-            u.CREATED_TIME,
+            a.CREATED_TIME,
             a.EXAMINE_FLAG AS examineStatus,
             a.id,
             a.USER_ID,
-            a.GRID_ID AS deptId,
+            a.DEPT_ID,
             a.REMARK
         FROM
-            epdc_user u
-            LEFT JOIN epdc_party_standard_bearer_apply AS a ON u.id = a.USER_ID
-            AND a.DEL_FLAG = '0'
+            epdc_party_standard_bearer_apply a
+            LEFT JOIN epdc_user u ON u.id = a.USER_ID AND u.DEL_FLAG = '0'
         <where>
-                u.DEL_FLAG = '0'
-                AND a.USER_ID = #{userId}
+                a.DEL_FLAG = '0'
             <if test="realName != null and realName != ''">
                 AND u.REAL_NAME = #{realName}
             </if>
             <if test="deptId != null and deptId != ''">
-                AND a.GRID_ID = #{deptId}
+                AND a.all_dept_ids like '%${deptId}%'
+            </if>
+            <if test="deptIdList != null and deptIdList.size() > 0">
+                AND a.dept_id in
+                <foreach collection="deptIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
             </if>
             <if test="examineStatus != null and examineStatus != ''">
                 AND a.EXAMINE_FLAG = #{examineStatus}
@@ -1843,21 +1845,21 @@
             r.id
         FROM
             epdc_user_tag_relation r
-        LEFT JOIN epdc_user u ON r.USER_ID = u.id
-        AND u.DEL_FLAG = '0'
+            LEFT JOIN epdc_user u ON r.USER_ID = u.id AND u.DEL_FLAG = '0'
         <where>
             r.del_flag = '0'
             <if test="identityNo != null and identityNo != ''">
                 AND u.IDENTITY_NO = #{identityNo}
             </if>
-            <if test="userId != null and userId != ''">
-                AND r.PARTY_ID = #{userId}
-            </if>
             <if test="realName != null and realName != ''">
                 AND u.REAL_NAME = #{realName}
             </if>
             <if test="deptId != null and deptId != ''">
-                AND u.DEPT_ID = #{deptId}
+                AND u.all_dept_ids like '%${deptId}%'
+            </if>
+            <if test="deptIdList != null and deptIdList.size() > 0">
+                AND u.grid_id in
+                <foreach collection="deptIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
             </if>
         </where>
     </select>