修改获取权限详情接口、获取组织树接口

common/src/main/java/com/lantone/common/dto/DataAuthDetailDTO.java

@@ -7,11 +7,9 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @ClassName: DataAuthDetailDTO
  * @Description:
  * @Author songxl
  * @Date 2021/7/22
- * @Version 1.0
  */
 @Data
 public class DataAuthDetailDTO implements Serializable {

common/src/main/java/com/lantone/common/dto/DeptDTO.java

@@ -7,11 +7,9 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @ClassName: DeptDTO
  * @Description: 科室返回对象
  * @Author songxl
  * @Date 2021/7/22
- * @Version 1.0
  */
 @Data
 public class DeptDTO implements Serializable {
@@ -49,5 +47,5 @@ public class DeptDTO implements Serializable {
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     private String isDeleted;
     @ApiModelProperty(value = "关联标志位 true 关联")
-    private boolean relationStatus;
+    private String relation = "未关联";
 }

common/src/main/java/com/lantone/common/dto/HospitalDTO.java

@@ -60,5 +60,5 @@ public class HospitalDTO implements Serializable {
     @ApiModelProperty(value = "该虚拟医院的医院列表")
     private List<HospitalDTO> hospitalDTOS;
     @ApiModelProperty(value = "关联标志位 true 关联")
-    private boolean relationStatus;
+    private String relation = "未关联";
 }

common/src/main/java/com/lantone/common/dto/SysServiceDTO.java

@@ -8,11 +8,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @ClassName: SysServiceVO
  * @Description: 系统服务对象
  * @Author songxl
  * @Date 2021/7/21
- * @Version 1.0
  */
 @Data
 public class SysServiceDTO implements Serializable {

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

@@ -43,6 +43,7 @@ import com.lantone.security.enums.DataAuthDataTypeEnum;
 import com.lantone.security.enums.DataAuthDetailTypeEnum;
 import com.lantone.security.enums.HospitalTypeEnum;
 import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.security.enums.RelationEnum;
 import com.lantone.security.enums.ServiceEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -381,8 +382,8 @@ public class DataAuthManagementFacade {
                         deptDTOS.add(deptDTO);
                         //该医院和该医院的科室 自定义关联关系为true
                         if (dataAuthDetailDTO.getDetailId() == deptDTO.getId()) {
-                            hospitalDTO.setRelationStatus(true);
-                            deptDTO.setRelationStatus(true);
+                            hospitalDTO.setRelation(RelationEnum.Y.getName());
+                            deptDTO.setRelation(RelationEnum.Y.getName());
                         }
                     }
                 }

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

@@ -410,6 +410,7 @@ public class HospitalManagementFacade {
         //1.获取当前用户的组织类型
         int hospitalType = -1;
         getHospitalListInfoVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
+        getHospitalListInfoVO.setCreator(SysUserUtils.getCurrentPrincipleId());
         Hospital hospital = hospitalFacade.getById(SysUserUtils.getCurrentHospitalId());
         if (hospital != null) {
             hospitalType = Integer.parseInt(hospital.getType());

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

@@ -96,7 +96,7 @@ public class UserManagementController {
 
     @ApiOperation(value = "获取当前用户所在组织的用户列表 [by:songxl]")
     @PostMapping("/getUserPage")
-    public CommonResult<IPage<GetUserPageDTO>> getUserPage(GetUserPageVO getUserPageVO) {
+    public CommonResult<IPage<GetUserPageDTO>> getUserPage(@RequestBody @Valid GetUserPageVO getUserPageVO) {
         return CommonResult.success(userManagementFacade.getUserPage(getUserPageVO));
     }
     @ApiOperation(value = "登录成功获取用户的系统医院信息 [by:songxl]")