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

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

@@ -35,5 +35,5 @@ public class GetRoleDTO implements Serializable {
     private List<SoftwareDTO> loginSoftwares;
 
     @ApiModelProperty(value = "当前登录对象系统服务菜单功能权限树")
-    private Map<Long,List<UserMenuResourceTreeDTO>> loginUserMenuResourceTree;
+    private List<UserMenuResourceTreeDTO> loginUserMenuResourceTree;
 }

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

@@ -18,6 +18,8 @@ public class UserMenuResourceTreeDTO implements Serializable {
 
     @ApiModelProperty(value = "系统编号编号")
     private Long softwareId;
+    @ApiModelProperty(value = "系统名称")
+    private String softwareName;
     @ApiModelProperty(value = "菜单编号")
     private Long menuId;
     @ApiModelProperty(value = "父级菜单编号")

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

@@ -1,19 +0,0 @@
-package com.lantone.common.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class AddAuthRoleVO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "角色名称" ,required = true)
-    @NotNull(message = "角色名称不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "角色名称" ,required = true)
-    private String name;
-}

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

@@ -3,6 +3,7 @@ package com.lantone.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -15,14 +16,12 @@ import java.util.List;
 public class AddAuthSoftwareVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "编号",required = true)
+    @ApiModelProperty(value = "系统服务编号",required = true)
     @NotNull(message = "系统服务编号为空")
     private Long id;
 
-    @ApiModelProperty(value = "服务名称")
-    private String name;
-
     @ApiModelProperty(value = "数据权限详情列表",required = true)
-    @NotEmpty(message = "数据权限详情列表为空")
-    private List<DataAuthDetailVO> dataAuthDetailVOS;
+    @Valid
+    @NotNull(message = "数据权限详情列表为空")
+    private DataAuthDetailVO dataAuthDetail;
 }

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

@@ -23,7 +23,6 @@ public class AddAuthVO {
     private AddDataAuthVO addDataAuthVO;
 
     @ApiModelProperty(value = "角色列表", required = true)
-    @Valid
     @NotEmpty(message = "角色列表为空")
-    private List<AddAuthRoleVO> roles;
+    private List<Long> roles;
 }

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

@@ -20,10 +20,7 @@ import java.util.List;
 @Data
 public class AddDataAuthVO implements Serializable {
     private static final long serialVersionUID = 1L;
-
-
     @ApiModelProperty(value = "数据权限名称", required = true)
-    @Valid
     @NotBlank(message = ("数据权限名称为空"))
     private String name;
 
@@ -31,11 +28,8 @@ public class AddDataAuthVO implements Serializable {
     @NotBlank(message = ("数据权限状态为空"))
     private String status;
 
-
-    @ApiModelProperty(value = "创建时间",hidden = true)
-    private Date createTime;
-
     @ApiModelProperty(value = "系统列表", required = true)
+    @Valid
     @NotEmpty(message = "系统列表为空")
     private List<AddAuthSoftwareVO> softwareVOS;
 

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

@@ -16,17 +16,6 @@ import java.util.List;
 public class AddHospitalTreeVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-//    @ApiModelProperty(value = "医院编号",required = true)
-//    @NotNull(message = "医院编号不能为空")
-//    private Long id;
-//
-//    @ApiModelProperty(value = "医院名称")
-//    private String name;
-//
-//    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）",required = true)
-//    @NotNull(message = "组织类型不能为空")
-//    private String type;
-
     @ApiModelProperty(value = "科室id列表")
     private List<Long> depts;
 

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

@@ -31,7 +31,7 @@ public class AddHospitalVO  implements Serializable {
     private String name;
 
 
-    @ApiModelProperty(value = "组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）",required = true)
+    @ApiModelProperty(value = "组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室 6:病区）",required = true)
     @NotBlank(message = "组织机构类型不能为空")
     private String type;
 
@@ -43,6 +43,13 @@ public class AddHospitalVO  implements Serializable {
     private String status;
 
 
+    @ApiModelProperty(value = "病区id")
+    private Long regionId;
+    @ApiModelProperty(value = "病区名称")
+    private String regionName;
+
+
+
     @ApiModelProperty(value = "记录创建时间",hidden = true)
     private Date gmtCreate;
 

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

@@ -6,19 +6,18 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
- * @ClassName: DataAuthDetailVO
  * @Description: 数据权限详情
  * @Author songxl
  * @Date 2021/7/22
- * @Version 1.0
  */
 @Data
 public class DataAuthDetailVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "数据权限编号")
+    @ApiModelProperty(value = "数据权限编号",hidden = true)
     private Long serviceDataAuthId;
 
     @ApiModelProperty(value = "数据范围类型：：1:全部组织,2:全部科室,3:全部科室除本科室外,4:本科室,5:本医疗组,6:本人,7:自定义" ,required = true)
@@ -28,12 +27,7 @@ public class DataAuthDetailVO implements Serializable {
     @ApiModelProperty(value = "detail_id的类型 1：detail_id为医院id 2：为科室id3：为医生id")
     private Integer detailType;
 
-    @ApiModelProperty(value = "医院、科室、医生id")
-    private Long detailId;
+    @ApiModelProperty(value = "医院、科室、医生id 列表")
+    private List<Long> detailIds;
 
-    @ApiModelProperty(value = "创建用户编号")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
 }

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

@@ -23,7 +23,6 @@ public class UpdateAuthVO {
     private UpdateDataAuthVO updateDataAuthVO;
 
     @ApiModelProperty(value = "角色列表", required = true)
-    @Valid
     @NotEmpty(message = "角色列表为空")
-    private List<AddAuthRoleVO> roles;
+    private List<Long> roles;
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleSoftwareDataAuth.java

@@ -62,7 +62,7 @@ public class RoleSoftwareDataAuth implements Serializable {
      * 创建人，0表示无创建人值
      */
     @TableField("creator")
-    private String creator;
+    private Long creator;
 
     /**
      * 修改人,如果为0则表示纪录未修改

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/HospitalMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface HospitalMapper extends BaseMapper<Hospital> {
 
-    List<GetHospitalTreeDTO> getHospitalTreeInfo(@Param("hospitalId") long hospitalId);
+    List<GetHospitalTreeDTO> getHospitalTreeInfo(@Param("hospitalId") long hospitalId,@Param("status")String status);
 
     List<GetHospitalListInfoDTO> getHospitalById(@Param("getHospitalListInfoVO") GetHospitalListInfoVO getHospitalListInfoVO);
 }

dblayer-mbg/src/main/resources/mapper/DoctorMapper.xml

@@ -30,33 +30,41 @@
         AND detail.is_deleted = 'N'
         WHERE
             dept.id = dd.dept_id
+        AND h.id = dept.hospital_id
         AND doc.id = dd.doctor_id
         AND h.is_deleted = 'N'
         AND dept.is_deleted = 'N'
         AND doc.is_deleted = 'N'
         AND dd.is_deleted = 'N'
+        <if test="doctorVO.name!=null and doctorVO.name!=''">
+            AND doc.`name` LIKE concat('%',#{doctorVO.name},'%')
+        </if>
+        <if test="doctorVO.mobilePhone!=null and doctorVO.mobilePhone!=''">
+            AND doc.mobilePhone LIKE concat('%',#{doctorVO.mobilePhone},'%')
+        </if>
+        ) t
+        WHERE 1=1
+        <if test="doctorVO.relation != null ">
+            AND t.relation = #{doctorVO.relation}
+        </if>
         <if test="doctorVO.hospitals !=null and doctorVO.hospitals.size!=0">
-            AND h.id IN
+            AND t.hospitalId IN
             <foreach collection="doctorVO.hospitals" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
-        <if test="doctorVO.depts !=null and doctorVO.depts.size!=0">
-            AND dept.id IN
+        <if test="doctorVO.hospitals !=null and doctorVO.hospitals.size!=0 and doctorVO.depts !=null and doctorVO.depts.size!=0">
+            OR t.deptId IN
             <foreach collection="doctorVO.depts" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
-        <if test="doctorVO.name!=null and doctorVO.name!=''">
-            AND doc.`name` LIKE concat('%',#{doctorVO.name},'%')
-        </if>
-        <if test="doctorVO.mobilePhone!=null and doctorVO.mobilePhone!=''">
-            AND doc.mobilePhone LIKE concat('%',#{doctorVO.mobilePhone},'%')
-        </if>
-        ) t
-        WHERE
-        <if test="doctorVO.relation != null ">
-            t.relation = #{doctorVO.relation}
+        <if test="(doctorVO.hospitals ==null or doctorVO.hospitals.size==0) and doctorVO.depts !=null and doctorVO.depts.size!=0">
+            AND t.deptId IN
+            <foreach collection="doctorVO.depts" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
         </if>
+
     </select>
 </mapper>

dblayer-mbg/src/main/resources/mapper/HospitalMapper.xml

@@ -11,7 +11,7 @@
             sys_hospital h
         WHERE
             h.is_deleted = 'N'
-        AND h.`status` = '1'
+        AND h.`status` = #{status}
         AND FIND_IN_SET(h.id, getChildList(#{hospitalId}))
     </select>
     <select id="getHospitalById" resultType="com.lantone.common.dto.GetHospitalListInfoDTO">

dblayer-mbg/src/main/resources/mapper/RoleMapper.xml

@@ -28,6 +28,6 @@
             r.is_deleted = 'N'
         AND r.`status` = '1'
         AND r.hospital_id = #{hospitalId}
-        AND r.`remark` != 'ManagementRole'
+--         AND r.`remark` != 'ManagementRole'
     </select>
 </mapper>

dblayer-mbg/src/main/resources/mapper/RoleSoftwareMenuMapper.xml

@@ -39,34 +39,38 @@
     </select>
 
     <select id="getUserMenuResourceTree" resultType="com.lantone.common.dto.UserMenuResourceTreeDTO">
-        SELECT DISTINCT
-            t1.menuId,
-            t1.parentId,
-            t1.softwareId,
-            t1.softwareMenuId,
-            t1.menuType,
-            t1.menuName,
-            t2.softwareResourceId
-        FROM
-            (
+            SELECT DISTINCT
+                t1.menuId,
+                t1.parentId,
+                t1.softwareId,
+                t1.softwareMenuId,
+                t1.menuType,
+                t1.menuName,
+                t2.softwareResourceId,
+                t1.softwareName
+                FROM
+                (
                 SELECT
-                    r.id roleId,
-                    m.id menuId,
-                    m.parent_id parentId,
-                    sm.software_id softwareId,
-                    sm.id softwareMenuId,
-                    m.type menuType,
-                    m.`name` menuName
+                r.id roleId,
+                m.id menuId,
+                m.parent_id parentId,
+                sm.software_id softwareId,
+                sm.id softwareMenuId,
+                m.type menuType,
+                m.`name` menuName,
+                s.`name` softwareName
                 FROM
-                    sys_role r
+                sys_role r
                 JOIN sys_role_software_menu rsm ON r.id = rsm.role_id
                 JOIN sys_software_menu sm ON rsm.software_menu_id = sm.id
                 JOIN sys_menu m ON sm.menu_id = m.id
+                JOIN sys_software s ON s.id = sm.software_id
                 WHERE
-                    r.is_deleted = 'N'
+                r.is_deleted = 'N'
                 AND rsm.is_deleted = 'N'
                 AND sm.is_deleted = 'N'
                 AND m.is_deleted = 'N'
+                AND s.is_deleted = 'N'
                 AND r.`status` = '1'
                 AND m.`status` = '1'
                 <if test="roles !=null and roles.size!=0">
@@ -117,29 +121,33 @@
                     t1.softwareMenuId,
                     t1.menuType,
                     t1.menuName,
-                    t2.softwareResourceId
-                FROM
+                    t2.softwareResourceId,
+                    t1.softwareName
+                    FROM
                     (
-                        SELECT
-                            r.id roleId,
-                            m.id menuId,
-                            m.parent_id parentId,
-                            sm.software_id softwareId,
-                            sm.id softwareMenuId,
-                            m.type menuType,
-                            m.`name` menuName
-                        FROM
-                            sys_role r
-                        JOIN sys_role_software_menu rsm ON r.id = rsm.role_id
-                        JOIN sys_software_menu sm ON rsm.software_menu_id = sm.id
-                        JOIN sys_menu m ON sm.menu_id = m.id
-                        WHERE
-                            r.is_deleted = 'N'
-                        AND rsm.is_deleted = 'N'
-                        AND sm.is_deleted = 'N'
-                        AND m.is_deleted = 'N'
-                        AND r.`status` = '1'
-                        AND m.`status` = '1'
+                    SELECT
+                    r.id roleId,
+                    m.id menuId,
+                    m.parent_id parentId,
+                    sm.software_id softwareId,
+                    sm.id softwareMenuId,
+                    m.type menuType,
+                    m.`name` menuName,
+                    s.`name` softwareName
+                    FROM
+                    sys_role r
+                    JOIN sys_role_software_menu rsm ON r.id = rsm.role_id
+                    JOIN sys_software_menu sm ON rsm.software_menu_id = sm.id
+                    JOIN sys_menu m ON sm.menu_id = m.id
+                    JOIN sys_software s ON s.id = sm.software_id
+                    WHERE
+                    r.is_deleted = 'N'
+                    AND rsm.is_deleted = 'N'
+                    AND sm.is_deleted = 'N'
+                    AND m.is_deleted = 'N'
+                    AND s.is_deleted = 'N'
+                    AND r.`status` = '1'
+                    AND m.`status` = '1'
                         <if test="loginRoles !=null and loginRoles.size!=0">
                             AND r.id IN
                             <foreach collection="loginRoles" item="id" open="(" close=")" separator=",">

security-center/src/main/java/com/lantone/security/enums/HospitalTypeEnum.java

@@ -15,7 +15,9 @@ public enum HospitalTypeEnum implements KeyedNamed {
     GROUP_HOSPITAL(1, "集团医院"),
     COMMON_HOSPITAL(2, "医共体"),
     UNION_HOSPITAL(3, "医联体"),
-    SINGLE_HOSPITAL(4, "单家医院");
+    SINGLE_HOSPITAL(4, "单家医院"),
+    DEPT(5, "科室"),
+    REGION(6, "病区");
 
     @Setter
     private int key;

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

@@ -16,10 +16,8 @@ import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.common.vo.AddAuthRoleVO;
 import com.lantone.common.vo.AddAuthSoftwareVO;
 import com.lantone.common.vo.AddAuthVO;
-import com.lantone.common.vo.DataAuthDetailVO;
 import com.lantone.common.vo.GetDataAuthPageVO;
 import com.lantone.common.vo.GetDoctorPageVO;
 import com.lantone.common.vo.UpdateAuthVO;
@@ -27,6 +25,7 @@ import com.lantone.dblayermbg.entity.DataAuth;
 import com.lantone.dblayermbg.entity.DataAuthDetail;
 import com.lantone.dblayermbg.entity.Dept;
 import com.lantone.dblayermbg.entity.Hospital;
+import com.lantone.dblayermbg.entity.Menu;
 import com.lantone.dblayermbg.entity.RoleSoftwareDataAuth;
 import com.lantone.dblayermbg.entity.SoftwareDataAuth;
 import com.lantone.dblayermbg.facade.DataAuthDetailFacade;
@@ -36,6 +35,8 @@ import com.lantone.dblayermbg.facade.DoctorFacade;
 import com.lantone.dblayermbg.facade.HospitalFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareDataAuthFacade;
 import com.lantone.dblayermbg.facade.SoftwareDataAuthFacade;
+import com.lantone.dblayermbg.service.impl.DataAuthDetailServiceImpl;
+import com.lantone.dblayermbg.service.impl.RoleSoftwareDataAuthServiceImpl;
 import com.lantone.security.enums.DataAuthDataTypeEnum;
 import com.lantone.security.enums.DataAuthDetailTypeEnum;
 import com.lantone.security.enums.HospitalTypeEnum;
@@ -50,15 +51,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 
 /**
- * @ClassName: DataAuthHandleFacade
  * @Description:数据权限操作facade
  * @Author songxl
  * @Date 2021/7/21
- * @Version 1.0
  */
 @Component
 public class DataAuthManagementFacade {
@@ -115,11 +115,11 @@ public class DataAuthManagementFacade {
                 }
             }
             //4.插入新建数据权限与系统的关系
-            saveServiceDataAuth(updateAuthVO.getUpdateDataAuthVO().getSoftwareVOS(), updateAuthVO.getRoles(), updateAuthVO.getUpdateDataAuthVO().getId());
+            return saveServiceDataAuth(updateAuthVO.getUpdateDataAuthVO().getSoftwareVOS(), updateAuthVO.getRoles(), updateAuthVO.getUpdateDataAuthVO().getId());
         } else {
             Asserts.fail("数据权限修改失败");
         }
-        return true;
+        return false;
     }
 
     /**
@@ -153,26 +153,27 @@ public class DataAuthManagementFacade {
      */
     public boolean deleteDataAuth(Long Id) {
         //1.删除数据权限
-        boolean dataAuthdelete = dataAuthFacade.remove(new UpdateWrapper<DataAuth>()
-                .eq("id", Id)
-                .eq("is_deleted", IsDeleteEnum.N.getKey()));
+        boolean dataAuthdelete = dataAuthFacade.update(new UpdateWrapper<DataAuth>()
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .eq("id", Id));
         if (dataAuthdelete) {
-            //2.获取该权限 系统与数据权限信息关联表（sys_service_data_auth）的关联id
-            List<Long> serviceDataAuthIDS = softwareDataAuthFacade.list(new QueryWrapper<SoftwareDataAuth>()
-                    .eq("data_auth_id", Id)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())).stream().map(SoftwareDataAuth::getId).collect(Collectors.toList());
-            //3.通过serviceDataAuthIDS 删除sys_role_service_data_auth和sys_service_data_auth和sys_data_auth_detail 对应关系
-            if (ListUtil.isNotEmpty(serviceDataAuthIDS)) {
-                if (deleteServiceDataAuth(serviceDataAuthIDS)) {
-                    return true;
-                } else {
-                    Asserts.fail("数据权限与系统关系删除失败");
-                }
-            }
+//            //2.获取该权限 系统与数据权限信息关联表（sys_service_data_auth）的关联id
+//            List<Long> serviceDataAuthIDS = softwareDataAuthFacade.list(new QueryWrapper<SoftwareDataAuth>()
+//                    .eq("data_auth_id", Id)
+//                    .eq("is_deleted", IsDeleteEnum.N.getKey())).stream().map(SoftwareDataAuth::getId).collect(Collectors.toList());
+//            //3.通过serviceDataAuthIDS 删除sys_role_service_data_auth和sys_service_data_auth和sys_data_auth_detail 对应关系
+//            if (ListUtil.isNotEmpty(serviceDataAuthIDS)) {
+//                if (deleteServiceDataAuth(serviceDataAuthIDS)) {
+//                    return true;
+//                } else {
+//                    Asserts.fail("数据权限与系统关系删除失败");
+//                }
+//            }
+            return true;
         } else {
             Asserts.fail("数据权限删除失败");
         }
-        return true;
+        return false;
     }
 
     /**
@@ -187,68 +188,78 @@ public class DataAuthManagementFacade {
         dataAuth.setGmtCreate(DateUtil.now());
         dataAuth.setCreator(SysUserUtils.getCurrentPrincipleId());
         if (dataAuthFacade.save(dataAuth)) {
-            //2.插入新建数据权限与系统的关系
-            saveServiceDataAuth(addAuthVO.getAddDataAuthVO().getSoftwareVOS(), addAuthVO.getRoles(), dataAuth.getId());
+            //2.插入新建数据权限与系统的关系 sys_software_data_auth
+            return saveServiceDataAuth(addAuthVO.getAddDataAuthVO().getSoftwareVOS(), addAuthVO.getRoles(), dataAuth.getId());
         } else {
             Asserts.fail("数据权限插入失败");
         }
-        return true;
+        return false;
 
     }
 
     /**
-     * @Description插入新建数据权限与系统的关系
      * @param softwareVOS
      * @param roles
      * @param dataAuthId
+     * @Description插入新建数据权限与系统的关系
      * @Return void
      */
-    private void saveServiceDataAuth(List<AddAuthSoftwareVO> softwareVOS, List<AddAuthRoleVO> roles, Long dataAuthId) {
-
-        for (AddAuthSoftwareVO sysServiceVO : softwareVOS) {
-            SoftwareDataAuth serviceDataAuth = new SoftwareDataAuth();
-            serviceDataAuth.setSoftwareId(sysServiceVO.getId());
-            serviceDataAuth.setDataAuthId(dataAuthId);
-            serviceDataAuth.setGmtCreate(DateUtil.now());
-            serviceDataAuth.setCreator("1");
-            //                serviceDataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
-            boolean serviceDataAuthInsert = softwareDataAuthFacade.save(serviceDataAuth);
-            if (serviceDataAuthInsert) {
-                //1.获取上一步插入时新生成的数据权限名称与系统关联编号service_data_auth _id
-                Long serviceDataAuthId = softwareDataAuthFacade.list(new QueryWrapper<SoftwareDataAuth>()
-                        .eq("software_id", sysServiceVO.getId())
-                        .eq("data_auth_id", dataAuthId)
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())).get(0).getId();
-
+    private boolean saveServiceDataAuth(List<AddAuthSoftwareVO> softwareVOS, List<Long> roles, Long dataAuthId) {
+        AtomicBoolean out = new AtomicBoolean(false);
+        softwareVOS.stream().forEach(softwareVO->{
+            SoftwareDataAuth softwareDataAuth = new SoftwareDataAuth();
+            softwareDataAuth.setSoftwareId(softwareVO.getId());
+            softwareDataAuth.setDataAuthId(dataAuthId);
+            softwareDataAuth.setGmtCreate(DateUtil.now());
+            softwareDataAuth.setCreator(SysUserUtils.getCurrentPrincipleId()+"");
+            if (softwareDataAuthFacade.save(softwareDataAuth)) {
                 //2.插入数据权限系统关联表与角色管理sys_role_service_data_auth
-                for (AddAuthRoleVO role : roles) {
+                List<RoleSoftwareDataAuth> roleSoftwareDataAuths = new ArrayList<>();
+                for (Long roleId : roles) {
                     RoleSoftwareDataAuth roleServiceDataAuth = new RoleSoftwareDataAuth();
-                    roleServiceDataAuth.setRoleId(role.getId());
-                    roleServiceDataAuth.setSoftwareDataAuthId(serviceDataAuthId);
+                    roleServiceDataAuth.setRoleId(roleId);
+                    roleServiceDataAuth.setSoftwareDataAuthId(softwareDataAuth.getId());
                     roleServiceDataAuth.setGmtCreate(DateUtil.now());
-                    roleServiceDataAuth.setCreator("1");
-                    //                        roleServiceDataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
-                    if (!roleSoftwareDataAuthFacade.save(roleServiceDataAuth)) {
-                        Asserts.fail("角色对应服务数据权限关系插入失败");
-                    }
+                    roleServiceDataAuth.setCreator(SysUserUtils.getCurrentPrincipleId());
+                    roleSoftwareDataAuths.add(roleServiceDataAuth);
                 }
-                //3.插入数据权限详细信息。sys_data_auth_detail
-                for (DataAuthDetailVO dataAuthDetailVO : sysServiceVO.getDataAuthDetailVOS()) {
-                    DataAuthDetail dataAuthDetail = new DataAuthDetail();
-                    BeanUtils.copyProperties(dataAuthDetailVO, dataAuthDetail);
-                    //                        dataAuthDetail.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
-                    dataAuthDetail.setGmtCreate(DateUtil.now());
-                    dataAuthDetail.setCreator("1");
-                    dataAuthDetail.setSoftwareDataAuthId(serviceDataAuthId);
-                    if (!dataAuthDetailFacade.save(dataAuthDetail)) {
-                        Asserts.fail("数据权限明细插入失败");
+                if (new RoleSoftwareDataAuthServiceImpl().saveBatch(roleSoftwareDataAuths)) {
+                    //3.插入数据权限详细信息。sys_data_auth_detail
+                    //自定义时
+                    List<DataAuthDetail> dataAuthDetails = new ArrayList<>();
+                    if (ListUtil.isNotEmpty(softwareVO.getDataAuthDetail().getDetailIds())
+                            && softwareVO.getDataAuthDetail().getDetailType() != null) {
+                        softwareVO.getDataAuthDetail().getDetailIds().stream().forEach(id -> {
+                            DataAuthDetail dataAuthDetail = new DataAuthDetail();
+                            BeanUtils.copyProperties(softwareVO.getDataAuthDetail(), dataAuthDetail);
+                            dataAuthDetail.setGmtCreate(DateUtil.now());
+                            dataAuthDetail.setCreator(SysUserUtils.getCurrentPrincipleId() + "");
+                            dataAuthDetail.setSoftwareDataAuthId(softwareDataAuth.getId());
+                            dataAuthDetail.setDetailId(id);
+                            dataAuthDetails.add(dataAuthDetail);
+                        });
+                    } else {
+                        DataAuthDetail dataAuthDetail = new DataAuthDetail();
+                        BeanUtils.copyProperties(softwareVO.getDataAuthDetail(), dataAuthDetail);
+                        dataAuthDetail.setGmtCreate(DateUtil.now());
+                        dataAuthDetail.setCreator(SysUserUtils.getCurrentPrincipleId() + "");
+                        dataAuthDetail.setSoftwareDataAuthId(softwareDataAuth.getId());
+                        dataAuthDetails.add(dataAuthDetail);
+                    }
+                    if(new DataAuthDetailServiceImpl().saveBatch(dataAuthDetails)){
+                        out.set(true);
+                    }else {
+                        Asserts.fail("数据权限详情插入失败");
                     }
+                } else {
+                    Asserts.fail("角色对应服务数据权限关系插入失败");
                 }
 
             } else {
                 Asserts.fail("服务对应数据权限关系插入失败");
             }
-        }
+        });
+        return out.get();
     }
 
     /**
@@ -318,8 +329,8 @@ public class DataAuthManagementFacade {
     }
 
     /**
-     * @Description 获取组织-科室信息以及自定义科室
      * @param dataAuthDetailDTO
+     * @Description 获取组织-科室信息以及自定义科室
      * @Return void
      */
     public void getDeptDetial(DataAuthDetailDTO dataAuthDetailDTO) {
@@ -340,9 +351,9 @@ public class DataAuthManagementFacade {
     }
 
     /**
-     * @Description取对应医院的科室信息
      * @param hospitalDTO
      * @param dataAuthDetailDTO
+     * @Description取对应医院的科室信息
      * @Return void
      */
     private void getDeptInfo(HospitalDTO hospitalDTO, DataAuthDetailDTO dataAuthDetailDTO) {
@@ -377,8 +388,8 @@ public class DataAuthManagementFacade {
     }
 
     /**
-     * @Description 获取医院对应的子医院信息
      * @param hospitalDTOS
+     * @Description 获取医院对应的子医院信息
      * @Return void
      */
     private void getAllHospitalDTO(List<HospitalDTO> hospitalDTOS) {

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

@@ -16,6 +16,7 @@ import com.lantone.dblayermbg.entity.MenuResource;
 import com.lantone.dblayermbg.entity.Resource;
 import com.lantone.dblayermbg.entity.SoftwareMenu;
 import com.lantone.dblayermbg.entity.SoftwareResource;
+import com.lantone.dblayermbg.entity.User;
 import com.lantone.dblayermbg.facade.MenuFacade;
 import com.lantone.dblayermbg.facade.MenuResourceFacade;
 import com.lantone.dblayermbg.facade.ResourceFacade;
@@ -239,15 +240,12 @@ public class FuncManagementFacade {
      */
     public Boolean deleteMenu(Long id) {
         //1.删除原来menu关联插入的数据
-        if (menuFacade.remove(new UpdateWrapper<Menu>()
-                .eq("id", id)
-                .eq("is_deleted", IsDeleteEnum.N.getKey()))) {
-            boolean flag = deleteMenuJoinDate(id, 1l);
-            if(flag){
-                //重新加载角色权限
-                resourceFacade.initResourceRolesMap();
-            }
-            return flag;
+        if (menuFacade.update(new UpdateWrapper<Menu>()
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .eq("id", id))) {
+            //重新加载角色权限
+            resourceFacade.initResourceRolesMap();
+            return true;
         } else {
             Asserts.fail("菜单详情删除失败");
         }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.lantone.common.dto.DownBoxRegionDTO;
 import com.lantone.common.dto.GetHospitalByIdDTO;
 import com.lantone.common.dto.GetHospitalListInfoDTO;
+import com.lantone.common.dto.GetHospitalTreeDTO;
 import com.lantone.common.dto.GetHospitalUserDTO;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.enums.StatusEnum;
@@ -21,16 +22,18 @@ import com.lantone.common.vo.AddRoleVO;
 import com.lantone.common.vo.AddUserVO;
 import com.lantone.common.vo.GetHospitalListInfoVO;
 import com.lantone.common.vo.UpdateHospitalVO;
-import com.lantone.dblayermbg.entity.DictionaryInfo;
+import com.lantone.dblayermbg.entity.Dept;
 import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.HospitalUser;
 import com.lantone.dblayermbg.entity.Region;
+import com.lantone.dblayermbg.entity.RegionDept;
 import com.lantone.dblayermbg.entity.Role;
 import com.lantone.dblayermbg.entity.User;
 import com.lantone.dblayermbg.facade.DeptFacade;
 import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
 import com.lantone.dblayermbg.facade.HospitalFacade;
 import com.lantone.dblayermbg.facade.HospitalUserFacade;
+import com.lantone.dblayermbg.facade.RegionDeptFacade;
 import com.lantone.dblayermbg.facade.RegionFacade;
 import com.lantone.dblayermbg.facade.RoleFacade;
 import com.lantone.dblayermbg.facade.UserFacade;
@@ -45,6 +48,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 /**
  * 组织管理API
@@ -70,6 +75,8 @@ public class HospitalManagementFacade {
     @Autowired
     private RegionFacade regionFacade;
     @Autowired
+    private RegionDeptFacade regionDeptFacade;
+    @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
 
     /**
@@ -78,15 +85,39 @@ public class HospitalManagementFacade {
      * @Return boolean
      */
     public boolean addHospital(AddHospitalVO addHospitalVO) {
-        Hospital hospital = new Hospital();
-        BeanUtils.copyProperties(addHospitalVO, hospital);
-        hospital.setGmtCreate(DateUtil.now());
-        //1.添加组织信息
-        if (hospitalFacade.save(hospital)) {
-            //2.保存该组织的用户
-            return saveUser(hospital.getId(), addHospitalVO);
-        } else {
-            Asserts.fail("组织添加失败");
+
+        //通过任务类型插入医院或科室
+        if((HospitalTypeEnum.DEPT.getKey()+"").equals(addHospitalVO.getType())){
+            Dept dept = new Dept();
+            BeanUtils.copyProperties(addHospitalVO, dept);
+            dept.setHospitalId(addHospitalVO.getParentId());
+            if(deptFacade.save(dept)){
+                //如果选择病区的话保存不能过去和科室的关系
+               if(addHospitalVO.getRegionId()!=null){
+                   RegionDept regionDept  = new RegionDept();
+                   regionDept.setHospitalId(addHospitalVO.getParentId());
+                   regionDept.setRegionId(addHospitalVO.getRegionId());
+                   regionDept.setDeptId(dept.getId());
+                   if(!regionDeptFacade.save(regionDept)){
+                       Asserts.fail("病区和科室关系插入失败");
+                   }
+               }
+                //2.保存该组织的用户
+                return saveUser(dept.getId(), addHospitalVO);
+            } else {
+                Asserts.fail("组织添加失败");
+            }
+        }else {
+            //1.添加组织信息
+            Hospital hospital = new Hospital();
+            BeanUtils.copyProperties(addHospitalVO, hospital);
+            hospital.setGmtCreate(DateUtil.now());
+            if (hospitalFacade.save(hospital)) {
+                //2.保存该组织的用户
+                return saveUser(hospital.getId(), addHospitalVO);
+            } else {
+                Asserts.fail("组织添加失败");
+            }
         }
         return false;
     }
@@ -104,13 +135,19 @@ public class HospitalManagementFacade {
         addRoleVO.setName(addHospitalVO.getName() + "组织管理角色");
         addRoleVO.setRemark("ManagementRole");
         addRoleVO.setStatus("1");
-        addRoleVO.setHospitalId(hospitalId);
+        Long insertHospitalId = 0l;
+        if((HospitalTypeEnum.DEPT.getKey()+"").equals(addHospitalVO.getType())){
+            insertHospitalId = addHospitalVO.getParentId();
+        }else {
+            insertHospitalId = hospitalId;
+        }
+        addRoleVO.setHospitalId(insertHospitalId);
         addRoleVO.setSoftwares(addHospitalVO.getSoftwares());
         if (roleManagementFacade.addRole(addRoleVO)) {
             //2.获取角色id完善新增用户信息
             Long roleId = roleFacade.list(new QueryWrapper<Role>()
                     .eq("name", addHospitalVO.getName() + "组织管理角色")
-                    .eq("hospital_id", hospitalId)).get(0).getId();
+                    .eq("hospital_id", insertHospitalId)).get(0).getId();
             //拼装添加用户信息
             AddUserVO addUserVO = new AddUserVO();
             BeanUtils.copyProperties(addHospitalVO.getAddHospitalUserVO(), addUserVO);
@@ -119,13 +156,22 @@ public class HospitalManagementFacade {
             addUserVO.getRoles().add(roleId);
             addUserVO.setName(addHospitalVO.getName() + "管理员");
             addUserVO.setRemark("Administrators");
-            //用户与组织的关系
+            //用户与组织的关系(医院、科室)
             AddHospitalTreeVO addHospitalTreeVO = new AddHospitalTreeVO();
-//            addHospitalTreeVO.setId(hospitalId);
-            BeanUtils.copyProperties(addHospitalVO, addHospitalTreeVO);
-            addHospitalTreeVO.setHospitals(new ArrayList<>());
-            addHospitalTreeVO.getHospitals().add(hospitalId);
-            addUserVO.setAddHospitalTreeVO(addHospitalTreeVO);
+            if((HospitalTypeEnum.DEPT.getKey()+"").equals(addHospitalVO.getType())){
+                addHospitalTreeVO.setDepts(new ArrayList<>());
+                addHospitalTreeVO.getDepts().add(hospitalId);
+                addUserVO.setAddHospitalTreeVO(addHospitalTreeVO);
+
+                addHospitalTreeVO.setHospitals(new ArrayList<>());
+                addHospitalTreeVO.getHospitals().add(addHospitalVO.getParentId());
+                addUserVO.setAddHospitalTreeVO(addHospitalTreeVO);
+            }else {
+                addHospitalTreeVO.setHospitals(new ArrayList<>());
+                addHospitalTreeVO.getHospitals().add(hospitalId);
+                addUserVO.setAddHospitalTreeVO(addHospitalTreeVO);
+            }
+
             return userManagementFacade.addUser(addUserVO);
         } else {
             Asserts.fail("角色插入失败");
@@ -139,15 +185,40 @@ public class HospitalManagementFacade {
      * @Return boolean
      */
     public boolean deleteHospital(Long hospitalId) {
-        //1.删除组织表sys_hospital
-        if (hospitalFacade.removeById(hospitalId)) {
-            //2.删除该组织的管理用户、角色
-            return deleteHUserAndRole(hospitalId);
-        } else {
-            Asserts.fail("组织表删除失败");
-        }
+        AtomicBoolean out = new AtomicBoolean(false);
+        //1.获取该组织及其子组织
+        List<Long> hospitals = hospitalFacade.getBaseMapper().getHospitalTreeInfo(hospitalId,StatusEnum.Enable.getKey()).stream()
+                .map(GetHospitalTreeDTO::getHospitalId).collect(Collectors.toList());
+        //2.删除这些组织的用户、角色
+        if (ListUtil.isNotEmpty(hospitals)) {
+            hospitals.forEach(id -> {
+                //删除该组织角色
+                if(roleFacade.update(new UpdateWrapper<Role>()
+                        .set("is_deleted", IsDeleteEnum.Y.getKey())
+                        .in("id", roleFacade.list(new QueryWrapper<Role>()
+                                .eq("hospital_id",id))
+                                .stream().map(Role::getId).collect(Collectors.toList())))){
 
-        return false;
+                    //删除组织用户
+                    if(userFacade.update(new UpdateWrapper<User>()
+                            .set("is_deleted", IsDeleteEnum.Y.getKey())
+                            .in("id", hospitalUserFacade.list(new QueryWrapper<HospitalUser>()
+                                    .eq("hospital_id",id))
+                                    .stream().map(HospitalUser::getUserId).collect(Collectors.toList())))){
+                        //删除组织
+                       out.set(hospitalFacade.update(new UpdateWrapper<Hospital>()
+                               .set("is_deleted", IsDeleteEnum.Y.getKey())
+                               .eq("id", id)));
+                    }else {
+                        Asserts.fail("组织用户删除失败");
+                    }
+                }else {
+                    Asserts.fail("组织角色删除失败");
+                }
+
+            });
+        }
+        return out.get();
     }
 
     /**
@@ -201,7 +272,45 @@ public class HospitalManagementFacade {
      * @Return boolean
      */
     public boolean disableHospital(Long hospitalId, String status) {
-        return hospitalFacade.update(new UpdateWrapper<Hospital>().set("status", status).eq("id", hospitalId));
+        AtomicBoolean out = new AtomicBoolean(false);
+        String selectStatus = "0";
+        if(StatusEnum.Enable.getKey().equals(status)){
+            selectStatus = StatusEnum.Disable.getKey();
+        }else {
+            selectStatus = StatusEnum.Enable.getKey();
+        }
+        //1.获取该组织及其子组织
+        List<Long> hospitals = hospitalFacade.getBaseMapper().getHospitalTreeInfo(hospitalId,selectStatus).stream()
+                .map(GetHospitalTreeDTO::getHospitalId).collect(Collectors.toList());
+        //2.禁用这些组织的用户、角色
+        if (ListUtil.isNotEmpty(hospitals)) {
+            hospitals.forEach(id -> {
+                //禁用该组织角色
+                if(roleFacade.update(new UpdateWrapper<Role>()
+                        .set("status", status)
+                        .in("id", roleFacade.list(new QueryWrapper<Role>()
+                                .eq("hospital_id",id))
+                                .stream().map(Role::getId).collect(Collectors.toList())))){
+
+                    //删除组织用户
+                    if(userFacade.update(new UpdateWrapper<User>()
+                            .set("status",status)
+                            .in("id", hospitalUserFacade.list(new QueryWrapper<HospitalUser>()
+                                    .eq("hospital_id",id))
+                                    .stream().map(HospitalUser::getUserId).collect(Collectors.toList())))){
+                        //删除组织
+                        out.set(hospitalFacade.update(new UpdateWrapper<Hospital>()
+                                .set("status", status).eq("id", id)));
+                    }else {
+                        Asserts.fail("组织用户禁用失败");
+                    }
+                }else {
+                    Asserts.fail("组织角色禁用失败");
+                }
+
+            });
+        }
+        return out.get();
     }
 
     /**
@@ -326,23 +435,24 @@ public class HospitalManagementFacade {
     private void getHospitalSonORUser(GetHospitalListInfoDTO hospital) {
         if (hospital != null && hospital.getHospitalId() != null) {
             //获取该组织用户
-            if(hospitalUserFacade.list(new QueryWrapper<HospitalUser>()
-                    .eq("hospital_id",hospital.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N.getKey())).size()>1){
+            if (hospitalUserFacade.list(new QueryWrapper<HospitalUser>()
+                    .eq("hospital_id", hospital.getHospitalId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())).size() > 1) {
                 hospital.setHasUserFlag(true);
             }
             //获取该组织子组织
-            if(hospitalFacade.list(new QueryWrapper<Hospital>()
-                    .eq("parent_id",hospital.getHospitalId())
+            if (hospitalFacade.list(new QueryWrapper<Hospital>()
+                    .eq("parent_id", hospital.getHospitalId())
                     .eq("status", StatusEnum.Enable.getKey())
-                    .eq("is_deleted",IsDeleteEnum.N.getKey())).size()>0){
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())).size() > 0) {
                 hospital.setHasHospitalFlag(true);
             }
         }
     }
+
     /**
-     * @Description重置密码
      * @param hospitalId
+     * @Description重置密码
      * @Return boolean
      */
     public boolean resetPassword(Long hospitalId) {

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

@@ -13,6 +13,7 @@ import com.lantone.common.dto.SoftwareDTO;
 import com.lantone.common.dto.SoftwareMenuRelationDTO;
 import com.lantone.common.dto.UserMenuResourceTreeDTO;
 import com.lantone.common.dto.UserRoleDTO;
+import com.lantone.common.enums.StatusEnum;
 import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
@@ -24,23 +25,31 @@ import com.lantone.common.vo.AddRoleVO;
 import com.lantone.common.vo.GetRolePageVO;
 import com.lantone.common.vo.UpdateRoleVO;
 import com.lantone.dblayermbg.entity.Hospital;
+import com.lantone.dblayermbg.entity.Menu;
+import com.lantone.dblayermbg.entity.Resource;
 import com.lantone.dblayermbg.entity.Role;
 import com.lantone.dblayermbg.entity.RoleSoftwareMenu;
 import com.lantone.dblayermbg.entity.RoleSoftwareResource;
+import com.lantone.dblayermbg.entity.SoftwareMenu;
+import com.lantone.dblayermbg.entity.SoftwareResource;
 import com.lantone.dblayermbg.entity.UserRole;
 import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
 import com.lantone.dblayermbg.facade.HospitalFacade;
+import com.lantone.dblayermbg.facade.MenuFacade;
 import com.lantone.dblayermbg.facade.ResourceFacade;
 import com.lantone.dblayermbg.facade.RoleFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareMenuFacade;
 import com.lantone.dblayermbg.facade.RoleSoftwareResourceFacade;
 import com.lantone.dblayermbg.facade.SoftwareFacade;
+import com.lantone.dblayermbg.facade.SoftwareMenuFacade;
+import com.lantone.dblayermbg.facade.SoftwareResourceFacade;
 import com.lantone.dblayermbg.facade.UserRoleFacade;
 import com.lantone.dblayermbg.service.impl.RoleSoftwareMenuServiceImpl;
 import com.lantone.dblayermbg.service.impl.RoleSoftwareResourceServiceImpl;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.security.enums.DictionaryEnum;
 import com.lantone.security.enums.RelationEnum;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -78,6 +87,12 @@ public class RoleManagementFacade {
     private DictionaryInfoFacade dictionaryInfoFacade;
     @Autowired
     private ResourceFacade resourceFacade;
+    @Autowired
+    private MenuFacade menuFacade;
+    @Autowired
+    private SoftwareMenuFacade softwareMenuFacade;
+    @Autowired
+    private SoftwareResourceFacade softwareResourceFacade;
 
 
     /**
@@ -120,6 +135,9 @@ public class RoleManagementFacade {
      * @Return java.lang.Boolean
      */
     public Boolean addRole(AddRoleVO addRoleVO) {
+        //校验
+        checkRole(addRoleVO.getName(),addRoleVO.getSoftwares());
+
         //1.角色表插入角色信息
         addRoleVO.setCreator(SysUserUtils.getCurrentPrincipleId());
         if(addRoleVO.getHospitalId()==null){
@@ -137,6 +155,54 @@ public class RoleManagementFacade {
         return false;
     }
 
+    /**
+     * @Description角色新增修改校验
+     * @param name
+     * @param softwares
+     * @Return void
+     */
+    private void checkRole(String name, List<AddRoleSoftwareVO> softwares) {
+        if(roleFacade.list(new QueryWrapper<Role>()
+                .eq("hospital_id",SysUserUtils.getCurrentHospitalId())
+                .eq("name",name)
+                .eq("is_deleted",IsDeleteEnum.N.getKey())).size()>0){
+            Asserts.fail("该角色已存在请重新输入");
+        }
+        if(ListUtil.isNotEmpty(softwares)){
+            softwares.stream().forEach(addRoleSoftwareVO -> {
+                //获取菜单比对插入的功能菜单都能正常使用
+               if(ListUtil.isNotEmpty(addRoleSoftwareVO.getSoftwareMenuIds())){
+                   if(addRoleSoftwareVO.getSoftwareMenuIds().size()!= menuFacade.count(new QueryWrapper<Menu>()
+                           .eq("status", StatusEnum.Enable.getKey())
+                           .eq("is_deleted",IsDeleteEnum.N.getKey())
+                           .in("id",softwareMenuFacade.list(new QueryWrapper<SoftwareMenu>()
+                                   .select("menu_id")
+                                   .eq("is_deleted",IsDeleteEnum.N.getKey())
+                                   .in("id",addRoleSoftwareVO.getSoftwareMenuIds()))
+                                   .stream().map(SoftwareMenu::getMenuId).collect(Collectors.toList())))){
+                       Asserts.fail("该角色要绑定的功能菜单已更新请刷新重试~");
+                   }
+               }
+                //功能权限校验
+                //获取菜单比对插入的功能菜单都能正常使用
+                if(ListUtil.isNotEmpty(addRoleSoftwareVO.getSoftwareResourceIds())){
+                    //去重 菜单对应的功能权限可能是一个
+                    Set resourceSet = new HashSet(addRoleSoftwareVO.getSoftwareResourceIds());
+                    if(resourceSet.size()!= resourceFacade.count(new QueryWrapper<Resource>()
+                            .eq("status", StatusEnum.Enable.getKey())
+                            .eq("is_deleted",IsDeleteEnum.N.getKey())
+                            .in("id",softwareResourceFacade.list(new QueryWrapper<SoftwareResource>()
+                                    .select("resource_id")
+                                    .eq("is_deleted",IsDeleteEnum.N.getKey())
+                                    .in("id",addRoleSoftwareVO.getSoftwareResourceIds()))
+                                    .stream().map(SoftwareResource::getResourceId).collect(Collectors.toList())))){
+                        Asserts.fail("该角色要绑定的功能菜单已更新请刷新重试~");
+                    }
+                }
+            });
+        }
+    }
+
     /**
      * @param softwares
      * @param roleId
@@ -252,20 +318,28 @@ public class RoleManagementFacade {
             List<Long> loginRoles = userRoleFacade.getBaseMapper().getUserRoles(SysUserUtils.getCurrentPrincipleId())
                     .stream().map(UserRoleDTO::getRoleId).collect(Collectors.toList());
             if(ListUtil.isNotEmpty(loginRoles)){
+                List<UserMenuResourceTreeDTO> userMenuResourceTreeDTOS =  getUserMenuResourceTreeByRoles(loginRoles, roles.stream().map(Role::getId).collect(Collectors.toList()));
                 //获取用户服务
                 List<SoftwareDTO> loginSoftwares = softwareFacade.getBaseMapper().getUserSoftware(loginRoles);
-                List<SoftwareDTO> hasSoftwares = softwareFacade.getBaseMapper().getUserSoftware(roles.stream().map(Role::getId).collect(Collectors.toList()));
+                List<Long> hasSoftwareIds = softwareFacade.getBaseMapper().getUserSoftware(roles.stream().map(Role::getId).collect(Collectors.toList()))
+                        .stream().map(SoftwareDTO::getId).collect(Collectors.toList());;
                 loginSoftwares.stream().forEach(softwareDTO -> {
-                    hasSoftwares.stream().forEach(hasSoftwareDto -> {
-                        if (softwareDTO.getId().equals(hasSoftwareDto.getId())) {
-                            softwareDTO.setRelation(RelationEnum.Y.getName());
-                        } else {
-                            softwareDTO.setRelation(RelationEnum.N.getName());
-                        }
-                    });
+                    if (hasSoftwareIds.contains(softwareDTO.getId())) {
+                        softwareDTO.setRelation(RelationEnum.Y.getName());
+                    } else {
+                        softwareDTO.setRelation(RelationEnum.N.getName());
+                    }
+                });
+                //添加功能树服务已关联标志
+                userMenuResourceTreeDTOS.stream().forEach(userMenuResourceTreeDTO -> {
+                    if (hasSoftwareIds.contains(userMenuResourceTreeDTO.getSoftwareId())) {
+                        userMenuResourceTreeDTO.setRelation(RelationEnum.Y.getName());
+                    } else {
+                        userMenuResourceTreeDTO.setRelation(RelationEnum.N.getName());
+                    }
                 });
                 getRoleDTO.setLoginSoftwares(loginSoftwares);
-                getRoleDTO.setLoginUserMenuResourceTree(getUserMenuResourceTreeByRoles(loginRoles, roles.stream().map(Role::getId).collect(Collectors.toList())));
+                getRoleDTO.setLoginUserMenuResourceTree(userMenuResourceTreeDTOS);
                 return getRoleDTO;
             }else {
                 Asserts.fail("该登录用户无角色信息");
@@ -320,7 +394,7 @@ public class RoleManagementFacade {
      * @param获取用户功能菜单树
      * @Return java.util.Map<java.lang.Long, java.util.List < com.lantone.common.dto.UserMenuResourceTreeDTO>>
      */
-    public Map<Long, List<UserMenuResourceTreeDTO>> getUserMenuResourceTree() {
+    public List<UserMenuResourceTreeDTO> getUserMenuResourceTree() {
         //1.获取当前用户的角色列表
         List<Long> roles = userRoleFacade.getBaseMapper().getUserRoles(SysUserUtils.getCurrentPrincipleId())
                 .stream().map(UserRoleDTO::getRoleId).collect(Collectors.toList());
@@ -337,7 +411,7 @@ public class RoleManagementFacade {
      * @Description通过角色列表获取用户功能菜单树
      * @Return java.util.Map<java.lang.Long, java.util.List < com.lantone.common.dto.UserMenuResourceTreeDTO>>
      */
-    private Map<Long, List<UserMenuResourceTreeDTO>> getUserMenuResourceTreeByRoles(List<Long> roles) {
+    private List<UserMenuResourceTreeDTO> getUserMenuResourceTreeByRoles(List<Long> roles) {
         List<UserMenuResourceTreeDTO> userMenuResourceTree = roleSoftwareMenuFacade.getBaseMapper().getUserMenuResourceTree(roles);
         return getTree(userMenuResourceTree);
     }
@@ -348,13 +422,13 @@ public class RoleManagementFacade {
      * @Description通过角色列表获取用户功能菜单树
      * @Return java.util.Map<java.lang.Long, java.util.List < com.lantone.common.dto.UserMenuResourceTreeDTO>>
      */
-    private Map<Long, List<UserMenuResourceTreeDTO>> getUserMenuResourceTreeByRoles(List<Long> loginRoles, List<Long> selectRoles) {
+    private List<UserMenuResourceTreeDTO> getUserMenuResourceTreeByRoles(List<Long> loginRoles, List<Long> selectRoles) {
         List<UserMenuResourceTreeDTO> userMenuResourceTree = roleSoftwareMenuFacade.getBaseMapper().getMenuResourceRelation(loginRoles, selectRoles);
         return getTree(userMenuResourceTree);
     }
 
-    private Map<Long, List<UserMenuResourceTreeDTO>> getTree(List<UserMenuResourceTreeDTO> userMenuResourceTree) {
-        Map<Long, List<UserMenuResourceTreeDTO>> resUserMenuResourceTree = new HashMap<>();
+    private List<UserMenuResourceTreeDTO> getTree(List<UserMenuResourceTreeDTO> userMenuResourceTree) {
+        List<UserMenuResourceTreeDTO> resUserMenuResourceTree = new ArrayList<>();
         //2.获取每个系统下的菜单、功能权限
         Map<Long, List<UserMenuResourceTreeDTO>> userMenuResourceMap = EntityUtil
                 .makeEntityListMap(userMenuResourceTree, "softwareId");
@@ -364,10 +438,14 @@ public class RoleManagementFacade {
                 Map<Long, List<UserMenuResourceTreeDTO>> menuResourceMap = EntityUtil
                         .makeEntityListMap(userMenuResourceMap.get(softwareId), "parentId");
                 List<UserMenuResourceTreeDTO> menuRes = menuResourceMap.get(0L);
+                UserMenuResourceTreeDTO tempSoftware = new UserMenuResourceTreeDTO();
+                tempSoftware.setSoftwareId(softwareId);
                 for (UserMenuResourceTreeDTO bean : menuRes) {
+                    tempSoftware.setSoftwareName(bean.getSoftwareName());
                     getSonMenu(bean, menuResourceMap);
                 }
-                resUserMenuResourceTree.put(softwareId, menuRes);
+                tempSoftware.setChildren(menuRes);
+                resUserMenuResourceTree.add(tempSoftware);
             });
         }
         return resUserMenuResourceTree;

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

@@ -138,6 +138,8 @@ public class UserManagementFacade {
         BeanUtils.copyProperties(addUserVO, user);
         user.setGmtCreate(DateUtil.now());
         user.setPassword(BCrypt.hashpw(user.getPassword()));
+        //1.1校验用户
+        checkUser(user.getUsername(), addUserVO.getAddHospitalTreeVO().getHospitals(), addUserVO.getRoles());
         try {
             if (userFacade.save(user)) {
                 //2.插入用户所属组织
@@ -151,6 +153,81 @@ public class UserManagementFacade {
         return false;
     }
 
+    /**
+     * @param usreName
+     * @param hospitals 插入用户组织id
+     * @param roles 插入用户角色id
+     * @Description用户校验
+     * @Return void
+     */
+    private void checkUser(String usreName, List<Long> hospitals, List<Long> roles) {
+
+        //1.当前登录用户、组织是否还存在、能用
+        loginCheck();
+        //2.当前用户是否已存在
+        if (userFacade.list(new QueryWrapper<User>()
+                .eq("username", usreName)
+                .eq("is_deleted", IsDeleteEnum.N.getKey())).size() > 0) {
+            Asserts.fail("该用户已存在,请更换用户名");
+        }
+        //3.校验插入用户所属组织是否正常
+        checkHospitals(hospitals);
+        //4.校验插入用户角色是否正常
+        checkRoles(roles);
+    }
+
+    /**
+     * @param roles
+     * @Description插入角色校验
+     * @Return void
+     */
+    private void checkRoles(List<Long> roles) {
+        if (ListUtil.isNotEmpty(roles)) {
+            if (roles.size() != roleFacade.list(new QueryWrapper<Role>()
+                    .in("id", roles)
+                    .eq("status", StatusEnum.Enable.getKey())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())).size()) {
+                Asserts.fail("插入用户角色列表有改动,请刷新页面重新操作");
+            }
+        }
+    }
+
+    /**
+     * @param hospitals
+     * @Description插入组织校验
+     * @Return void
+     */
+    private void checkHospitals(List<Long> hospitals) {
+        if (ListUtil.isNotEmpty(hospitals)) {
+            if (hospitals.size() != hospitalFacade.list(new QueryWrapper<Hospital>()
+                    .in("id", hospitals)
+                    .eq("status", StatusEnum.Enable.getKey())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())).size()) {
+                Asserts.fail("插入用户所属组织有改动,请刷新页面重新操作");
+            }
+        }
+    }
+
+    /**
+     * @param
+     * @Description操作用户校验
+     * @Return void
+     */
+    private void loginCheck() {
+        if (hospitalFacade.list(new QueryWrapper<Hospital>()
+                .eq("id", SysUserUtils.getCurrentHospitalId())
+                .eq("status", StatusEnum.Enable.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())).size() <= 0) {
+            Asserts.fail("操作用户所属组织已被禁用或删除");
+        }
+        if (userFacade.list(new QueryWrapper<User>()
+                .eq("id", SysUserUtils.getCurrentPrincipleId())
+                .eq("status", StatusEnum.Enable.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())).size() <= 0) {
+            Asserts.fail("该账号暂未开通或已被禁用，请联系管理员~");
+        }
+    }
+
     /**
      * @param addHospitalTreeVO
      * @param userId
@@ -212,7 +289,7 @@ public class UserManagementFacade {
         Hospital hospital = hospitalFacade.getById(SysUserUtils.getCurrentHospitalId());
         //获取当前医院的树状结构
         List<GetHospitalTreeDTO> hospitalTrees = hospitalFacade.getBaseMapper()
-                .getHospitalTreeInfo(SysUserUtils.getCurrentHospitalId());
+                .getHospitalTreeInfo(SysUserUtils.getCurrentHospitalId(), StatusEnum.Enable.getKey());
         //根据parentid分组
         Map<Long, List<GetHospitalTreeDTO>> hospitalMap = EntityUtil.makeEntityListMap(hospitalTrees, "parentId");
         //深度遍历拼装结果
@@ -235,6 +312,8 @@ public class UserManagementFacade {
      */
     public boolean updateUser(UpdateUserVO updateUserVO) {
         //1.删除该用户关联的科室、医院
+        //1.1校验用户
+        checkUser(updateUserVO.getUsername(), updateUserVO.getAddHospitalTreeVO().getHospitals(), updateUserVO.getRoles());
         if (delUserHospitalORDept(updateUserVO.getId())) {
             User user = new User();
             BeanUtils.copyProperties(updateUserVO, user);
@@ -284,11 +363,9 @@ public class UserManagementFacade {
      * @Return boolean
      */
     public boolean deleteUser(Long userId) {
-
-        if (delUserHospitalORDept(userId)) {
-            return userFacade.removeById(userId);
-        }
-        return false;
+        return userFacade.update(new UpdateWrapper<User>()
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .eq("id", userId));
     }
 
     /**
@@ -326,7 +403,7 @@ public class UserManagementFacade {
         //3.2获取当前登录用户的组织机构树
         //获取当前医院的树状结构
         List<GetHospitalTreeDTO> hospitalTrees = hospitalFacade.getBaseMapper()
-                .getHospitalTreeInfo(SysUserUtils.getCurrentHospitalId());
+                .getHospitalTreeInfo(SysUserUtils.getCurrentHospitalId(), StatusEnum.Enable.getKey());
         //根据parentid分组
         Map<Long, List<GetHospitalTreeDTO>> hospitalMap = EntityUtil.makeEntityListMap(hospitalTrees, "parentId");
         //深度遍历拼装结果
@@ -480,9 +557,7 @@ public class UserManagementFacade {
      * @Return java.util.List<com.lantone.common.dto.GetUserHospitalsDTO>
      */
     private List<GetUserHospitalsDTO> transTreeData(Map<Long, List<GetUserHospitalsDTO>> softwareHospitalMap, List<GetUserHospitalsDTO> softwareHospitals) {
-        if (softwareHospitalMap == null) {
-            return null;
-        }
+        if (softwareHospitalMap == null) return null;
         List<GetUserHospitalsDTO> out = new ArrayList<>();
         Set<Long> tempParents = new HashSet<>();
         Set<Long> parents = softwareHospitalMap.keySet();

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

@@ -83,7 +83,7 @@ public class RoleManagementController {
 
     @ApiOperation(value = "获取当前登录用户管理的的功能权限树 [by:songxl]")
     @PostMapping("/getUserMenuResourceTree")
-    public CommonResult<Map<Long, List<UserMenuResourceTreeDTO>>> getUserMenuResourceTree() {
+    public CommonResult<List<UserMenuResourceTreeDTO>> getUserMenuResourceTree() {
         return CommonResult.success(roleManagementFacade.getUserMenuResourceTree());
     }