获取推送人ID列表接口修改

business-service/src/main/java/com/ozs/service/service/impl/BaseUserServiceImpl.java

@@ -22,35 +22,37 @@ public class BaseUserServiceImpl extends ServiceImpl<BaseUserMapper, BaseUser> i
     @Override
     public Set<String> getUserIdList(String createBy, Long deptId) {
         Set<String> set = new HashSet<>();
-        // 根据create_by、data_permission=1(本人)
-        Set<String> set1 = baseUserMapper.getUserIdList(createBy);
-        set.addAll(set1);
-        // 根据 dept_id（本部门）data_permission=2
-        Set<String> set2 = baseUserMapper.getUserIdByDeptId(deptId);
-        set.addAll(set2);
+//        // 根据create_by、data_permission=1(本人)
+//        Set<String> set1 = baseUserMapper.getUserIdList(createBy);
+//        set.addAll(set1);
+//        // 根据 dept_id（本部门）data_permission=2
+//        Set<String> set2 = baseUserMapper.getUserIdByDeptId(deptId);
+//        set.addAll(set2);
         // 根据 dept_id(本部门及下级部门数据) data_permission=3
         // 获取部门数据
         List<Long> deptList = baseUserMapper.getDeptId(deptId);
         // 获取用户列表
+        deptList.add(235L);
+        deptList.add(243L);
         Set<String> set3 = baseUserMapper.getUserIdByDeptIds(deptList);
         set.addAll(set3);
-        // 本人及本级部门数据 data_permission=4
-        Set<String> set4 = baseUserMapper.getUserIdByDeptIdAndUserId(createBy, deptId);
-        set.addAll(set4);
-        // 本人及本部门及下级部门数据 data_permission=5
-        // 获取本人
-        Set<String> setUser = baseUserMapper.getUserIdListBy5(createBy);
-        // 获取部门数据
-        List<Long> deptList5 = baseUserMapper.getDeptId(deptId);
-        // 获取用户列表
-        Set<String> setUsers = baseUserMapper.getUserIdByDeptIdsBy5(deptList5);
-        Set<String> set5 = new HashSet<>();
-        set5.addAll(setUser);
-        set5.addAll(setUsers);
-        set.addAll(set5);
-        // 全部 data_permission=6
-        Set<String> set6 = baseUserMapper.getUserIdList6();
-        set.addAll(set6);
+//        // 本人及本级部门数据 data_permission=4
+//        Set<String> set4 = baseUserMapper.getUserIdByDeptIdAndUserId(createBy, deptId);
+//        set.addAll(set4);
+//        // 本人及本部门及下级部门数据 data_permission=5
+//        // 获取本人
+//        Set<String> setUser = baseUserMapper.getUserIdListBy5(createBy);
+//        // 获取部门数据
+//        List<Long> deptList5 = baseUserMapper.getDeptId(deptId);
+//        // 获取用户列表
+//        Set<String> setUsers = baseUserMapper.getUserIdByDeptIdsBy5(deptList5);
+//        Set<String> set5 = new HashSet<>();
+//        set5.addAll(setUser);
+//        set5.addAll(setUsers);
+//        set.addAll(set5);
+//        // 全部 data_permission=6
+//        Set<String> set6 = baseUserMapper.getUserIdList6();
+//        set.addAll(set6);
         return set;
     }
 

business-service/src/main/resources/mapper/service/BaseUserMapper.xml

@@ -25,7 +25,7 @@
     <select id="getUserIdByDeptIds" resultType="java.lang.String" parameterType="java.util.List">
         select user_id
         from sys_user
-        where data_permission = 3 and dept_id in
+        where  dept_id in
         <foreach item="item" collection="deptList" separator="," open="(" close=")" index="">
             #{item}
         </foreach>