bug修复

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -55,19 +55,14 @@ import com.xjrsoft.module.oa.vo.ProclamationPageVo;
 import com.xjrsoft.module.oa.vo.ProclamationVo;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.entity.Department;
-import com.xjrsoft.module.organization.entity.Role;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
-import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.mapper.DepartmentMapper;
 import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
 import com.xjrsoft.module.organization.mapper.UserMapper;
 import com.xjrsoft.module.organization.service.IWeChatService;
-import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
-import com.xjrsoft.module.student.service.IStudentManagerService;
-import com.xjrsoft.module.student.vo.BaseStudentInfoPageVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
@@ -123,7 +118,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
     @Override
     public List<NewsGradeClassTreeVo> getGradeClassTree() {
-        List<NewsGradeClassTreeVo> treeVoList = new ArrayList<NewsGradeClassTreeVo>();
+        List<NewsGradeClassTreeVo> treeVoList = new ArrayList<>();
 
         //虚拟父级
         treeVoList.add(new NewsGradeClassTreeVo() {{
@@ -190,100 +185,11 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         }
 
         //如果状态是2，表示立即发布的公告，需要将阅读人添加进阅读关系表
+        addRelation(news, addProclamationDto, 2);
         if(addProclamationDto.getStatus() == 2){
-            addRelation(news, addProclamationDto, 2);
             return news.getId();
         }
 
-        if(addProclamationDto.getSendRange() == 1){
-            MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-            queryUser
-                    .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                    .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                    .eq(Role::getId, 2);
-            List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-            for (XjrUser user: userList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-            List<BaseStudentInfoPageVo> studyingList = baseStudentSchoolRollMapper.getStudyingList(new BaseStudentInfoPageDto());
-            for (BaseStudentInfoPageVo user: studyingList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-        } else if(addProclamationDto.getSendRange() == 2){
-            MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-            queryUser
-                    .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                    .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                    .eq(Role::getId, 2);
-            List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-            for (XjrUser user: userList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-
-        } else if (addProclamationDto.getSendRange() == 3) {
-            for (AddNewsRelationDto relationDto : addProclamationDto.getRelationList()) {
-
-                NewsRelationConfig newsRelationConfig = BeanUtil.toBean(relationDto, NewsRelationConfig.class);
-                newsRelationConfig.setNewsId(news.getId());
-                newsRelationConfigMapper.insert(newsRelationConfig);
-
-                NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                if (relationDto.getRelationType() == 1) {
-                    // 获取部门下的人员添加
-                    Long deptId = relationDto.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .eq(Department::getId, deptId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    for (XjrUser user : userList) {
-                        newsRelation.setUserId(user.getId());
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                }
-                if (relationDto.getRelationType() == 2) {
-                    newsRelation.setUserId(relationDto.getRelationId());
-                    newsRelationMapper.insert(newsRelation);
-                }
-                if (relationDto.getRelationType() == 3) {
-                    // 获取班级下的人员添加
-                    Long deptId = relationDto.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .eq(Department::getId, deptId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    List<Long> userIdList = new ArrayList<>();
-                    for (XjrUser user : userList) {
-                        userIdList.add(user.getId());
-                    }
-                    for (Long userId : userIdList) {
-                        newsRelation.setUserId(userId);
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                }
-            }
-        }
-
         //没有任何问题返回
         return -1L;
     }
@@ -452,94 +358,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
             updateRelationConfig(news, updateProclamationDto);
         }
         newsRelationMapper.delete(Wrappers.lambdaQuery(NewsRelation.class).eq(NewsRelation::getNewsId, news.getId()));
-        if(updateProclamationDto.getSendRange() == 1){
-            MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-            queryUser
-                    .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                    .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                    .eq(Role::getId, 2);
-            List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-            for (XjrUser user: userList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-            List<BaseStudentInfoPageVo> studyingList = baseStudentSchoolRollMapper.getStudyingList(new BaseStudentInfoPageDto());
-            for (BaseStudentInfoPageVo user: studyingList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-        } else if(updateProclamationDto.getSendRange() == 2){
-            MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-            queryUser
-                    .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                    .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                    .eq(Role::getId, 2);
-            List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-            for (XjrUser user: userList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-
-        } else if (updateProclamationDto.getSendRange() == 3) {
-            for (AddNewsRelationDto relationDto : updateProclamationDto.getRelationList()) {
-
-                NewsRelationConfig newsRelationConfig = BeanUtil.toBean(relationDto, NewsRelationConfig.class);
-                newsRelationConfig.setNewsId(news.getId());
-                newsRelationConfigMapper.insert(newsRelationConfig);
-
-                NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                if (relationDto.getRelationType() == 1) {
-                    // 获取部门下的人员添加
-                    Long deptId = relationDto.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .eq(Department::getId, deptId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    for (XjrUser user : userList) {
-                        newsRelation.setUserId(user.getId());
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                }
-                if (relationDto.getRelationType() == 2) {
-                    newsRelation.setUserId(relationDto.getRelationId());
-                    newsRelationMapper.insert(newsRelation);
-                }
-                if (relationDto.getRelationType() == 3) {
-                    // 获取班级下的人员添加
-                    Long deptId = relationDto.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .eq(Department::getId, deptId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    List<Long> userIdList = new ArrayList<>();
-                    for (XjrUser user : userList) {
-                        userIdList.add(user.getId());
-                    }
-                    for (Long userId : userIdList) {
-                        newsRelation.setUserId(userId);
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                }
-            }
-        }
+        addRelation(news, BeanUtil.toBean(updateProclamationDto, AddProclamationDto.class), 2);
         return true;
     }
 
@@ -690,87 +509,11 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 newsRelationMapper.insertPersonl(xjrNews.getId(), userIdList);
             }
 
-        }
-
-        //遍历所有关系配置
-           /* for (NewsRelationConfig newsRelationConfig : newsRelationConfigList) {
-                //阅读关系是部门
-                if (newsRelationConfig.getRelationType() == 1) {
-                    // 获取部门下的人员添加
-                    Long deptId = newsRelationConfig.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                            .eq(Department::getId, deptId)
-                            .eq(Role::getId, 2);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    for (XjrUser user : userList) {
-                        if (!userMap.containsKey(user.getId())) {
-                            userMap.put(user.getId(), user);
-                            newsRelationMapper.insert(new NewsRelation() {{
-                                setNewsId(xjrNews.getId());
-                                setUserId(user.getId());
-                                setReadMark(0);
-                                setCreateDate(LocalDateTime.now());
-                            }});
-                        }
-                    }
-                }
-                //阅读关系是人员
-                if (newsRelationConfig.getRelationType() == 2) {
-                    if (!userMap.containsKey(newsRelationConfig.getRelationId())) {
-                        userMap.put(newsRelationConfig.getRelationId(), new XjrUser() {{
-                            setId(newsRelationConfig.getRelationId());
-                        }});
-                        newsRelationMapper.insert(new NewsRelation() {{
-                            setNewsId(xjrNews.getId());
-                            setUserId(newsRelationConfig.getRelationId());
-                            setReadMark(0);
-                            setCreateDate(LocalDateTime.now());
-                        }});
-                    }
-                }
-                //阅读关系是班级
-                if (newsRelationConfig.getRelationType() == 3) {
-                    // 获取班级下的人员添加
-                    Long classId = newsRelationConfig.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
-                            .eq(BaseStudentSchoolRoll::getClassId, classId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    for (XjrUser user : userList) {
-                        if (!userMap.containsKey(user.getId())) {
-                            userMap.put(user.getId(), user);
-                            newsRelationMapper.insert(new NewsRelation() {{
-                                setNewsId(xjrNews.getId());
-                                setUserId(user.getId());
-                                setReadMark(0);
-                                setCreateDate(LocalDateTime.now());
-                            }});
-                        }
-                    }
-                }
-            }*/
-        if (xjrNews.getSendRange() == 2) {
-//                MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-//                queryUser
-//                        .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-//                        .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-//                        .eq(Role::getId, 2);
-//                List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-//                for (XjrUser user : userList) {
-//                    newsRelationMapper.insert(new NewsRelation() {{
-//                        setNewsId(xjrNews.getId());
-//                        setUserId(user.getId());
-//                        setReadMark(0);
-//                        setCreateDate(LocalDateTime.now());
-//                    }});
-//                }
+        }else if (xjrNews.getSendRange() == 2) {
             newsRelationMapper.insertAllTeaStaff(xjrNews.getId());
+        }else if (xjrNews.getSendRange() == 1) {
+            newsRelationMapper.insertClassUser(xjrNews.getId(), null);
+            newsRelationMapper.insertDeptUser(xjrNews.getId(), null);
         }
         return true;
     }
@@ -794,95 +537,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
         //公告需要添加阅读关系，发送范围 1=全校教职工 2=全校师生 3=指定人员
         //1=全校教职工,添加全校教职工到关系表
-        if(addNewsDto.getSendRange() == 1){
-            MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-            queryUser
-                    .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                    .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                    .eq(Role::getId, 2);
-            List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-            for (XjrUser user: userList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-            List<BaseStudentInfoPageVo> studyingList = baseStudentSchoolRollMapper.getStudyingList(new BaseStudentInfoPageDto());
-            for (BaseStudentInfoPageVo user: studyingList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-        } else if(addNewsDto.getSendRange() == 2){
-            MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-            queryUser
-                    .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                    .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                    .eq(Role::getId, 2);
-            List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-            for (XjrUser user: userList) {
-                NewsRelation newsRelation = new NewsRelation();
-                newsRelation.setUserId(user.getId());
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                newsRelation.setCreateDate(LocalDateTime.now());
-                newsRelationMapper.insert(newsRelation);
-            }
-
-        } else if (addNewsDto.getSendRange() == 3) {
-            for (AddNewsRelationDto relationDto : addNewsDto.getRelationList()) {
-
-                NewsRelationConfig newsRelationConfig = BeanUtil.toBean(relationDto, NewsRelationConfig.class);
-                newsRelationConfig.setNewsId(news.getId());
-                newsRelationConfigMapper.insert(newsRelationConfig);
-
-                NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
-                newsRelation.setNewsId(news.getId());
-                newsRelation.setReadMark(0);
-                if (relationDto.getRelationType() == 1) {
-                    // 获取部门下的人员添加
-                    Long deptId = relationDto.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .eq(Department::getId, deptId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    for (XjrUser user : userList) {
-                        newsRelation.setUserId(user.getId());
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                }
-                if (relationDto.getRelationType() == 2) {
-                    newsRelation.setUserId(relationDto.getRelationId());
-                    newsRelationMapper.insert(newsRelation);
-                }
-                if (relationDto.getRelationType() == 3) {
-                    // 获取班级下的人员添加
-                    Long deptId = relationDto.getRelationId();
-                    MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                    queryUser
-                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                            .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                            .eq(Department::getId, deptId);
-                    List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                    List<Long> userIdList = new ArrayList<>();
-                    for (XjrUser user : userList) {
-                        userIdList.add(user.getId());
-                    }
-                    for (Long userId : userIdList) {
-                        newsRelation.setUserId(userId);
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                }
-            }
-        }
-
+        addRelation(news, BeanUtil.toBean(addNewsDto, AddProclamationDto.class), 1);
         //添加新闻和公告的时候，如果状态是2，表示新闻和公告实时发布了，张贴开始时间就应该是发布时间需要发送消息
         if (ObjectUtil.isNotNull(addNewsDto.getStatus()) && addNewsDto.getStatus() == 2) {
             SendMessage(news.getId());
@@ -923,110 +578,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         if (updateNewsDto.getRelationList() != null) {
             newsRelationMapper.delete(Wrappers.lambdaQuery(NewsRelation.class).eq(NewsRelation::getNewsId, news.getId()));
             newsRelationConfigMapper.delete(Wrappers.lambdaQuery(NewsRelationConfig.class).eq(NewsRelationConfig::getNewsId, news.getId()));
-            if(updateNewsDto.getSendRange() == 1){
-                MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                queryUser
-                        .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                        .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                        .eq(Role::getId, 2);
-                List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-                for (XjrUser user: userList) {
-                    NewsRelation newsRelation = new NewsRelation();
-                    newsRelation.setUserId(user.getId());
-                    newsRelation.setReadMark(0);
-                    newsRelation.setNewsId(news.getId());
-                    newsRelation.setCreateDate(LocalDateTime.now());
-                    newsRelationMapper.insert(newsRelation);
-                }
-                List<BaseStudentInfoPageVo> studyingList = baseStudentSchoolRollMapper.getStudyingList(new BaseStudentInfoPageDto());
-                for (BaseStudentInfoPageVo user: studyingList) {
-                    NewsRelation newsRelation = new NewsRelation();
-                    newsRelation.setUserId(user.getId());
-                    newsRelation.setNewsId(news.getId());
-                    newsRelation.setReadMark(0);
-                    newsRelation.setCreateDate(LocalDateTime.now());
-                    newsRelationMapper.insert(newsRelation);
-                }
-            } else if(updateNewsDto.getSendRange() == 2){
-                MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                queryUser
-                        .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, XjrUser::getId)
-                        .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId)
-                        .eq(Role::getId, 2);
-                List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class,queryUser);
-                for (XjrUser user: userList) {
-                    NewsRelation newsRelation = new NewsRelation();
-                    newsRelation.setUserId(user.getId());
-                    newsRelation.setNewsId(news.getId());
-                    newsRelation.setReadMark(0);
-                    newsRelation.setCreateDate(LocalDateTime.now());
-                    newsRelationMapper.insert(newsRelation);
-                }
-
-            } else if (updateNewsDto.getSendRange() == 3) {
-                for (AddNewsRelationDto relationDto : updateNewsDto.getRelationList()) {
-
-                    NewsRelationConfig newsRelationConfig = BeanUtil.toBean(relationDto, NewsRelationConfig.class);
-                    newsRelationConfig.setNewsId(news.getId());
-                    newsRelationConfigMapper.insert(newsRelationConfig);
-
-                    NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
-                    newsRelation.setNewsId(news.getId());
-                    newsRelation.setReadMark(0);
-                    if (relationDto.getRelationType() == 1) {
-                        // 获取部门下的人员添加
-                        Long deptId = relationDto.getRelationId();
-                        MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                        queryUser
-                                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                                .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                                .eq(Department::getId, deptId);
-                        List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                        for (XjrUser user : userList) {
-                            newsRelation.setUserId(user.getId());
-                            newsRelationMapper.insert(newsRelation);
-                        }
-                    }
-                    if (relationDto.getRelationType() == 2) {
-                        newsRelation.setUserId(relationDto.getRelationId());
-                        newsRelationMapper.insert(newsRelation);
-                    }
-                    if (relationDto.getRelationType() == 3) {
-                        // 获取班级下的人员添加
-                        Long deptId = relationDto.getRelationId();
-                        MPJLambdaWrapper<XjrUser> queryUser = new MPJLambdaWrapper<>();
-                        queryUser
-                                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
-                                .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId)
-                                .eq(Department::getId, deptId);
-                        List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryUser);
-                        List<Long> userIdList = new ArrayList<>();
-                        for (XjrUser user : userList) {
-                            userIdList.add(user.getId());
-                        }
-                        for (Long userId : userIdList) {
-                            newsRelation.setUserId(userId);
-                            newsRelationMapper.insert(newsRelation);
-                        }
-                    }
-                }
-            }
-//            for (AddNewsRelationDto relationDto : updateNewsDto.getRelationList()) {
-//
-//                NewsRelationConfig newsRelationConfig = BeanUtil.toBean(relationDto, NewsRelationConfig.class);
-//                newsRelationConfig.setNewsId(news.getId());
-//                newsRelationConfigMapper.insert(newsRelationConfig);
-//
-//                NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
-//                newsRelation.setNewsId(news.getId());
-//                newsRelation.setReadMark(0);
-//                if (relationDto.getRelationType() == 1) {
-//                    // 获取部门下的人员添加
-//                } else {
-//                    newsRelation.setUserId(relationDto.getRelationId());
-//                    newsRelationMapper.insert(newsRelation);
-//                }
-//            }
+            addRelation(news, BeanUtil.toBean(updateNewsDto, AddProclamationDto.class), 1);
         }
 
         return true;

src/main/resources/mapper/oa/NewsRelationMapper.xml

@@ -79,4 +79,5 @@
             </foreach>
         </if>)
     </insert>
+
 </mapper>