Merge branch 'pre'

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

@@ -1052,6 +1052,9 @@ 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;
                 }

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());