1、授课管理-删除、新增

web/src/main/java/com/ibeetl/jlw/entity/TeachingManagement.java

@@ -53,7 +53,6 @@ public class TeachingManagement extends BaseEntity{
     //组织机构ID
 
     private Long orgId ;
-    private String classId ;
 
     public TeachingManagement(){
     }
@@ -175,11 +174,4 @@ public class TeachingManagement extends BaseEntity{
         this.orgId = orgId;
     }
 
-    public String getClassId() {
-        return classId;
-    }
-
-    public void setClassId(String classId) {
-        this.classId = classId;
-    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeachingManagementService.java

@@ -168,7 +168,7 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
             query.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
             query.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
             query.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
-            query.setSchoolClassInfo(teacherBoundClass.getClassId());
+            query.setSchoolClassInfo(teacherBoundClass.getSchoolClassInfo());
             List<TeachingManagement> valuesByQueryNotWithPermission = teachingManagementDao.getValuesByQueryNotWithPermission(query);
 
             if (CollectionUtil.isEmpty(valuesByQueryNotWithPermission)){
@@ -176,7 +176,7 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
                 teachingManagement.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
                 teachingManagement.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
                 teachingManagement.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
-                teachingManagement.setSchoolClassInfo(teacherBoundClass.getClassId());
+                teachingManagement.setSchoolClassInfo(teacherBoundClass.getSchoolClassInfo());
                 teachingManagement.setTeacherMergeClassThirdAddTime(new Date());
                 teachingManagement.setTeacherMergeClassThirdStatus(1);
                 teachingManagement.setOrgId(teachingManagementQuery.getOrgId());
@@ -220,7 +220,7 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
             query.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
             query.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
             query.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
-            query.setSchoolClassInfo(management.getClassId());
+            query.setSchoolClassInfo(management.getSchoolClassInfo());
             List<TeachingManagement> valuesByQueryNotWithPermission = teachingManagementDao.getValuesByQueryNotWithPermission(query);
 
             if (CollectionUtil.isEmpty(valuesByQueryNotWithPermission)){
@@ -228,7 +228,7 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
                 addTeachingManagement.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
                 addTeachingManagement.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
                 addTeachingManagement.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
-                addTeachingManagement.setSchoolClassInfo(management.getClassId());
+                addTeachingManagement.setSchoolClassInfo(management.getSchoolClassInfo());
                 addTeachingManagement.setTeacherMergeClassThirdAddTime(new Date());
                 addTeachingManagement.setTeacherMergeClassThirdStatus(1);
                 addTeachingManagement.setOrgId(teachingManagementQuery.getOrgId());

web/src/main/java/com/ibeetl/jlw/web/TeachingManagementController.java

@@ -198,13 +198,13 @@ public class TeachingManagementController{
     @PostMapping(MODEL + "/edit.json")
     @Function("teachingManagement.edit")
     @ApiOperation("编辑")
-    public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeachingManagementQuery teachingManagementQuery, BindingResult result) {
+    public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class) TeachingManagementQuery teachingManagementQuery, BindingResult result,@SCoreUser CoreUser coreUser) {
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else {
             Assert.notNull(getUser(), "请登录后再操作");
-                teachingManagementQuery.setUserId(null);
-                teachingManagementQuery.setOrgId(null);
+                teachingManagementQuery.setUserId(coreUser.getId());
+                teachingManagementQuery.setOrgId(coreUser.getOrgId());
             String msg = teachingManagementService.edit(teachingManagementQuery);
             if (StringUtils.isBlank(msg)) {
                 return JsonResult.success();