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

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

@@ -42,7 +42,6 @@ public class UniversityFacultyController extends BaseController {
 
 
     @Autowired private UniversityFacultyService universityFacultyService;
-
     @Autowired private UniversitiesCollegesService universitiesCollegesService;
 
     @Autowired
@@ -154,25 +153,6 @@ public class UniversityFacultyController extends BaseController {
         return JsonResult.success(page);
     }
 
-    @PostMapping(MODEL + "/addAll.json")
-    @Function("universityFaculty.add")
-    @ResponseBody
-    public JsonResult addAll(UniversityFacultyQuery universityFacultyQuery,@SCoreUser CoreUser coreUser){
-        if(null == coreUser){
-            return JsonResult.failMessage("请登录后再操作");
-        }else{
-            universityFacultyQuery.setUserId(coreUser.getId());
-            universityFacultyQuery.setOrgId(coreUser.getOrgId());
-            String msg = universityFacultyService.addAll(universityFacultyQuery);
-            if (StringUtils.isBlank(msg)) {
-                corePlatformService.clearDictCache();
-                return JsonResult.success();
-            } else {
-                return JsonResult.failMessage("新增失败,"+msg);
-            }
-        }
-    }
-
     @PostMapping(MODEL + "/add.json")
     @Function("universityFaculty.add")
     @ResponseBody
@@ -180,8 +160,11 @@ public class UniversityFacultyController extends BaseController {
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
+            UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(universityFacultyQuery.getUniversitiesCollegesId());
+            // 操作人
             universityFacultyQuery.setUserId(coreUser.getId());
-            universityFacultyQuery.setOrgId(coreUser.getOrgId());
+            // 所属机构ID
+            universityFacultyQuery.setOrgId(universitiesColleges.getOrgId());
             corePlatformService.clearDictCache();
             return universityFacultyService.add(universityFacultyQuery);
         }

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

@@ -183,8 +183,11 @@ public class UniversitySystemController extends BaseController {
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
+            UniversityFaculty universityFaculty = facultyService.queryById(universitySystemQuery.getUniversityFacultyId());
+            // 操作人
             universitySystemQuery.setUserId(coreUser.getId());
-            universitySystemQuery.setOrgId(coreUser.getOrgId());
+            // 所属机构ID
+            universitySystemQuery.setOrgId(universityFaculty.getOrgId());
             if(null == universitySystemQuery.getUniversitySystemStatus()){
                 universitySystemQuery.setUniversitySystemStatus(1);
             }

web/src/main/java/com/ibeetl/jlw/web/query/UniversityFacultyQuery.java

@@ -28,6 +28,7 @@ public class UniversityFacultyQuery extends PageParam {
     private String universityFacultyContactAddress;
 //    @Query(name = "院校ID （院系的上一级）", display = true)
     @Query(name = "院校ID", display = false)
+    @NotNull(message = "院校ID不能为空", groups = ValidateConfig.ADD.class)
     private Long universitiesCollegesId;
 //    @Query(name = "状态（ 1 正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status")
     @Query(name = "状态", display = false,type=Query.TYPE_DICT,dict=GLOBAL_STATUS)

web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java

@@ -30,6 +30,7 @@ public class UniversitySystemQuery extends PageParam {
     private Integer universitySystemStatus;
 //    @Query(name = "院系ID（学院ID）", display = false)
     @Query(name = "院系ID", display = false)
+    @NotNull(message = "院系ID不能为空", groups = ValidateConfig.ADD.class)
     private Long universityFacultyId;
     @Query(name = "用户ID", display = false)
     private Long userId;