Merge remote-tracking branch 'origin/dev' into dev

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

@@ -167,6 +167,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         News news = BeanUtil.toBean(addProclamationDto, News.class);
         news.setTypeId(2);
         news.setEnabledMark(EnabledMark.ENABLED.getCode());
+        news.setCreateDate(LocalDateTime.now());
+        news.setCreateUserId(StpUtil.getLoginIdAsLong());
         //LambdaQueryWrapper<News> queryWrapperSortcode = new LambdaQueryWrapper<>();
         //queryWrapperSortcode.select("SELECT IFNULL(MAX(sort_code),1)");
         newsMapper.insert(news);

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -1093,15 +1093,15 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                 data.setAssessmentUserId(StpUtil.getLoginIdAsLong());
                 data.setAssessmentDate(sdf.parse(dto.getAssessmentDate()));
 
+                BaseStudentAssessmentClassRelation children2 = new BaseStudentAssessmentClassRelation();
+                children2.setBaseStudentAssessmentInspectionId(id);
+                children2.setClassId(baseClass.getId());
+                children2.setSortCode(sortCode);
+                child2InsertList.add(children2);
+                sortCode ++;
+
                 if("班级".equals(dto.getAssessmentType())){
                     data.setAssessmentType("class");
-
-                    BaseStudentAssessmentClassRelation children = new BaseStudentAssessmentClassRelation();
-                    children.setBaseStudentAssessmentInspectionId(id);
-                    children.setClassId(baseClass.getId());
-                    children.setSortCode(sortCode);
-                    child2InsertList.add(children);
-                    sortCode ++;
                 }else if("个人".equals(dto.getAssessmentType())){
                     data.setAssessmentType("personal");
                     if(!studentMap.containsKey(dto.getCredentialNumber())){