Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

common/src/main/java/com/lantone/common/vo/GetDeptListVO.java

@@ -15,6 +15,9 @@ public class GetDeptListVO {
     @ApiModelProperty(value = "医院ID",hidden = true)
     private Long hospitalId;
 
+    @ApiModelProperty(value = "用户ID",hidden = true)
+    private Long userId;
+
     @ApiModelProperty(value = "科室名称")
     private String deptName;
 }

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("当前组织和病区已重复");
             }
-        }
     }
 
     /**
@@ -277,10 +280,19 @@ public class RegionManagementFacade {
      */
     public  List<DeptListDTO> getDept(GetDeptListVO getDeptListVO){
         getDeptListVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
+        getDeptListVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         List<DeptListDTO> deptListDTOS = new ArrayList<>();
+        List<Long> depts = regionDeptService.lambdaQuery()
+                .eq(RegionDept::getHospitalId, getDeptListVO.getHospitalId())
+                .eq(RegionDept::getIsDeleted,IsDeleteEnum.N.getKey())
+                .eq(RegionDept::getCreator, getDeptListVO.getUserId())
+                .list().stream().map(RegionDept::getDeptId).collect(Collectors.toList());
         LambdaQueryChainWrapper<Dept> lambdaQueryChainWrapper = deptFacade.lambdaQuery();
         lambdaQueryChainWrapper.eq(Dept::getHospitalId,getDeptListVO.getHospitalId());
         lambdaQueryChainWrapper.eq(Dept::getIsDeleted,IsDeleteEnum.N.getKey());
+        if(ListUtil.isNotEmpty(depts)){
+            lambdaQueryChainWrapper.in(Dept::getId,depts);
+        }
         if(StringUtil.isNotEmpty(getDeptListVO.getDeptName())){
             lambdaQueryChainWrapper.like(Dept::getName,getDeptListVO.getDeptName());
         }

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -71,9 +71,9 @@ public class RegionManagementController {
         return CommonResult.success(sysRegionFacade.deleteRegion(id));
     }
 
-    @ApiOperation(value = "获取科室列表[by:cy]")
+  /*  @ApiOperation(value = "获取科室列表[by:cy]")
     @PostMapping("/getDeptList")
     public CommonResult<List<DeptListDTO>> getDeptList(@RequestBody GetDeptListVO getDeptListVO) {
         return CommonResult.success(sysRegionFacade.getDept(getDeptListVO));
-    }
+    }*/
 }