冗余代码处理

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -132,11 +132,16 @@ public class RegionManagementFacade {
      */
     public Boolean deleteRegion(Integer id) {
         Long hospitalId = SysUserUtils.getCurrentHospitalId();
-        boolean flag = regionFacade.lambdaUpdate()
+                       regionFacade.lambdaUpdate()
                 .eq(Region::getId,id)
                 .eq(Region::getHospitalId, hospitalId)
                 .set(Region::getIsDeleted,IsDeleteEnum.Y.getKey())
                 .update();
+        boolean flag = regionDeptService.lambdaUpdate()
+                .eq(RegionDept::getRegionId, id)
+                .eq(RegionDept::getHospitalId, hospitalId)
+                .set(RegionDept::getIsDeleted,IsDeleteEnum.Y.getKey())
+                .update();
         return flag;
     }
 
@@ -150,16 +155,14 @@ public class RegionManagementFacade {
     public void getCheckRegion(SaveRegionVO saveRegionVo) {
         saveRegionVo.setHospitalId(SysUserUtils.getCurrentHospitalId());
         saveRegionVo.setUserId(SysUserUtils.getCurrentPrincipleId());
-        if (null == saveRegionVo.getId()) {
-            Region region = regionFacade.lambdaQuery()
+            int count = regionFacade.lambdaQuery()
                     .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey())
                     .eq(Region::getName, saveRegionVo.getName())
                     .eq(Region::getHospitalId, saveRegionVo.getHospitalId())
-                    .one();
-            if(null != region && null != region.getId()){
+                    .count();
+            if(count>0){
                 throw new ApiException("当前组织和病区已重复");
             }
-        }
     }
 
     /**