liu 1 rok temu
rodzic
commit
0e4838b6f9

+ 17 - 0
src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -66,6 +66,15 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
 
     @Override
     @Override
     public CommonResult saveDormitory(WelcomeDormitory welcomeDormitory) {
     public CommonResult saveDormitory(WelcomeDormitory welcomeDormitory) {
+
+        WelcomeBuild byId = welcomeBuildService.getById(welcomeDormitory.getBuildId());
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("该楼栋不存在");
+        }
+        if (!byId.getSex().equals(welcomeDormitory.getSex())) {
+            return CommonResult.fail("请勿跨性别添加寝室");
+        }
+
         WelcomeDormitory existCount =welcomeDormitoryService.queryExistDormotory(welcomeDormitory.getSchoolId(),welcomeDormitory.getBuildId(),welcomeDormitory.getDormitory());
         WelcomeDormitory existCount =welcomeDormitoryService.queryExistDormotory(welcomeDormitory.getSchoolId(),welcomeDormitory.getBuildId(),welcomeDormitory.getDormitory());
         if(existCount != null && existCount.getId().intValue() != welcomeDormitory.getId().intValue()){
         if(existCount != null && existCount.getId().intValue() != welcomeDormitory.getId().intValue()){
             return CommonResult.ok("当前寝室号已存在");
             return CommonResult.ok("当前寝室号已存在");
@@ -132,6 +141,14 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     @Override
     @Override
     public CommonResult updateDormitory(WelcomeDormitory welcomeDormitory) {
     public CommonResult updateDormitory(WelcomeDormitory welcomeDormitory) {
 
 
+        WelcomeBuild byId = welcomeBuildService.getById(welcomeDormitory.getBuildId());
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("该楼栋不存在");
+        }
+        if (!byId.getSex().equals(welcomeDormitory.getSex())) {
+            return CommonResult.fail("请勿跨性别添加寝室");
+        }
+
          WelcomeDormitory existCount =welcomeDormitoryService.queryExistDormotory(welcomeDormitory.getSchoolId(),welcomeDormitory.getBuildId(),welcomeDormitory.getDormitory());
          WelcomeDormitory existCount =welcomeDormitoryService.queryExistDormotory(welcomeDormitory.getSchoolId(),welcomeDormitory.getBuildId(),welcomeDormitory.getDormitory());
          if(existCount != null && existCount.getId().intValue() != welcomeDormitory.getId().intValue()){
          if(existCount != null && existCount.getId().intValue() != welcomeDormitory.getId().intValue()){
              return CommonResult.ok("当前寝室号已存在");
              return CommonResult.ok("当前寝室号已存在");