收文magic-api，当taskid为0的时候返回所有的人员

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

@@ -127,6 +127,34 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<NextReviewerListVo> nextReviewerList(String taskId) {
+        if("0".equals(taskId)){
+            // 根据部门获取部门管理人员
+            MPJLambdaWrapper<XjrUser> xjrUserMPJLambdaWrapper = new MPJLambdaWrapper<>();
+            xjrUserMPJLambdaWrapper
+                    .selectAs(XjrUser::getId, NextReviewerListVo::getValue)
+                    .selectAs(XjrUser::getName, NextReviewerListVo::getLabel)
+                    .selectAs(Department::getName, NextReviewerListVo::getDeptName)
+                    .innerJoin(UserPostRelation.class, UserPostRelation::getUserId, XjrUser::getId)
+                    .innerJoin(Post.class, Post::getId, UserPostRelation::getPostId)
+                    .leftJoin(Department.class, Department::getId, Post::getDeptId)
+                    .and(wrapper ->
+                            wrapper
+                                    .like(Post::getName, "主任")
+                                    .or()
+                                    .like(Post::getName, "书记")
+                    )
+            ;
+            List<NextReviewerListVo> voList = xjrUserMapper.selectJoinList(NextReviewerListVo.class, xjrUserMPJLambdaWrapper);
+
+            for (NextReviewerListVo vo : voList){
+                if(ObjectUtils.isNotEmpty(vo.getDeptName())){
+                    vo.setLabel(vo.getLabel() + "(" + vo.getDeptName() + ")");
+                }
+            }
+
+            return voList;
+        }
+
         // 根据流程Id获取分管领导审核节点的审核人
         LambdaQueryWrapper<WorkflowRecord> workflowRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         workflowRecordLambdaQueryWrapper
@@ -207,6 +235,34 @@ public class OfficialDocumentReceivedServiceImpl extends MPJBaseServiceImpl<Offi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<NextReviewerListVo> nextExecutorList(String taskId) {
+        if("0".equals(taskId)){
+            // 根据部门获取部门管理人员
+            MPJLambdaWrapper<XjrUser> xjrUserMPJLambdaWrapper = new MPJLambdaWrapper<>();
+            xjrUserMPJLambdaWrapper
+                    .selectAs(XjrUser::getId, NextReviewerListVo::getValue)
+                    .selectAs(XjrUser::getName, NextReviewerListVo::getLabel)
+                    .selectAs(Department::getName, NextReviewerListVo::getDeptName)
+                    .innerJoin(UserPostRelation.class, UserPostRelation::getUserId, XjrUser::getId)
+                    .innerJoin(Post.class, Post::getId, UserPostRelation::getPostId)
+                    .leftJoin(Department.class, Department::getId, Post::getDeptId)
+                    .and(wrapper ->
+                            wrapper
+                                    .like(Post::getName, "副主任")
+                                    .or()
+                                    .like(Post::getName, "副书记")
+                    )
+            ;
+            List<NextReviewerListVo> voList = xjrUserMapper.selectJoinList(NextReviewerListVo.class, xjrUserMPJLambdaWrapper);
+
+            for (NextReviewerListVo vo : voList){
+                if(ObjectUtils.isNotEmpty(vo.getDeptName())){
+                    vo.setLabel(vo.getLabel() + "(" + vo.getDeptName() + ")");
+                }
+            }
+
+            return voList;
+        }
+
         // 根据流程Id获取部门主任意见审核节点的审核人
         LambdaQueryWrapper<WorkflowRecord> workflowRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         workflowRecordLambdaQueryWrapper

src/main/java/com/xjrsoft/module/xycxedu/service/impl/ExamSubjectScoreEnterServiceImpl.java

@@ -36,6 +36,7 @@ import com.xjrsoft.module.xycxedu.vo.ExamSubjectScoreEnterPageVo;
 import com.xjrsoft.module.xycxedu.vo.ExamSubjectScoreEnterVo;
 import lombok.AllArgsConstructor;
 import me.zhyd.oauth.log.Log;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -84,6 +85,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
             if (credentialNumbers.isEmpty()) {
                 return true;
             }
+
             List<User> userList = userService.list(
                     new MPJLambdaWrapper<User>()
                             .select(User::getId)
@@ -106,6 +108,9 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
             List<ExamSubjectScore> updateList = new ArrayList<>();
             for (ExamSubjectScoreEnterImportDto importVo : dataList) {
                 Long userId = userMaps.get(importVo.getCredentialNumber());
+                if(ObjectUtils.isEmpty(userId)){
+                    throw new MyException(importVo.getStudentName() + "不在" + importVo.getClassName() + "班级中，请核实学生基础数据");
+                }
                 ExamSubjectScore examSubjectScores = listMap.get(userId);
                 examSubjectScores.setCourseSubjectId(enter.getCourseSubjectId());
                 examSubjectScores.setScore(importVo.getScore() == null ? null : Float.parseFloat(importVo.getScore()));