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

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassServiceImpl.java

@@ -253,7 +253,7 @@ public class BaseClassServiceImpl extends MPJBaseServiceImpl<BaseClassMapper, Ba
                 }
             }
 
-            if(baseClass.getTeacherId() == null && aClass.getTeacherId() != null){
+            if((baseClass.getTeacherId() == null && aClass.getTeacherId() != null) || (baseClass.getIsGraduate() != null && baseClass.getIsGraduate() == 2)){
                 long count = this.count(
                         new QueryWrapper<BaseClass>().lambda()
                                 .eq(BaseClass::getIsGraduate, 1)

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -220,7 +220,10 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
     public CourseTableVo getList(CourseTableDto dto) {
 
         List<ClassTime> classTimes = classTimeMapper.selectList(
-                new QueryWrapper<ClassTime>().lambda().orderByAsc(ClassTime::getSummerStartTime)
+                new QueryWrapper<ClassTime>().lambda()
+                        .ne(ClassTime::getTimePeriod, 0)
+                        .orderByAsc(ClassTime::getSummerStartTime)
+
         );
 
         CourseTableVo tableVo = new CourseTableVo();
@@ -1052,6 +1055,10 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 rowData.add(timeNumberStr);
                 List<CourseDetailVo> list1 = timeNumberDataMap.get(timeNumber.toString());
                 if(list1 == null){
+                    for (Integer week : weekList) {
+                        rowData.add("");
+                    }
+                    dataList.add(rowData);
                     continue;
                 }
                 Map<Integer, List<CourseDetailVo>> weeksMap = list1.stream().collect(Collectors.groupingBy(CourseDetailVo::getWeeks));

src/main/java/com/xjrsoft/module/organization/controller/RoleController.java

@@ -160,6 +160,10 @@ public class RoleController {
     @PutMapping
     @ApiOperation(value = "修改角色")
     public R update(@Valid @RequestBody UpdateRoleDto dto) {
+        Role byId = roleService.getById(dto.getId());
+        if(byId.getIsSystem() != null && byId.getIsSystem() == 1){
+            return R.error("系统角色不能修改！");
+        }
         if (dto.getId().equals(GlobalConstant.SUPER_ADMIN_ROLE_ID)) {
             return R.error("超级管理员角色不能修改！");
         }
@@ -172,6 +176,7 @@ public class RoleController {
         if (count > 0) {
             return R.error("角色名称或编码已存在！");
         }
+
         Role role = BeanUtil.toBean(dto, Role.class);
         roleService.updateById(role);
         CompletableFuture.runAsync(() -> {

src/main/java/com/xjrsoft/module/organization/vo/RolePageVo.java

@@ -36,6 +36,7 @@ public class RolePageVo implements Serializable {
     @ApiModelProperty("启用状态")
     private Integer enabledMark;
 
-
+    @ApiModelProperty("是否系统角色(1:是 0:否)")
+    private Integer isSystem;
 
 }

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

@@ -107,8 +107,8 @@ public class StudentChangeRecordServiceImpl extends MPJBaseServiceImpl<StudentCh
                 setAfterDataCode(StudyStatusEnum.AttendDaySchool.getCode());
             }
 
-            setBeforeData(schoolRoll.getStduyStatus());
-            setBeforeDataCode(StudyStatusEnum.fromCode(schoolRoll.getStduyStatus()));
+            setBeforeDataCode(schoolRoll.getStduyStatus());
+            setBeforeData(StudyStatusEnum.fromCode(schoolRoll.getStduyStatus()));
             setChangeType(StudentChangeTypeEnum.StduyStatus.getCode());
             setUserId(schoolRoll.getUserId());
             setCreateDate(new Date());