权限管理模块-bean更新

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

@@ -1,114 +0,0 @@
-package com.lantone.dblayermbg.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 菜单功能表
- * </p>
- */
-@Data
-@TableName("sys_menu_info")
-public class MenuInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 父级编号
-     */
-    @TableField("parent_id")
-    private Long parentId;
-
-    /**
-     * 系统id
-     */
-    @TableField("system_id")
-    private Long systemId;
-
-    /**
-     * 功能名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 类型：0:目录，1菜单，2按钮，3：超链接
-     */
-    @TableField("type")
-    private String type;
-
-    /**
-     * 页面路由
-     */
-    @TableField("url")
-    private String url;
-
-    /**
-     * 权限标识
-     */
-    @TableField("permission")
-    private String permission;
-
-    /**
-     * 图标
-     */
-    @TableField("icon")
-    private String icon;
-
-    /**
-     * 排序
-     */
-    @TableField("order_no")
-    private String orderNo;
-
-    /**
-     * 状态 0:禁用，1：启用
-     */
-    @TableField("status")
-    private String status;
-
-    /**
-     * 描述
-     */
-    @TableField("describe")
-    private String describe;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 创建用户编号
-     */
-    @TableField("creator")
-    private Long creator;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-
-}

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

@@ -1,96 +0,0 @@
-package com.lantone.dblayermbg.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 组织表
- * </p>
- */
-@Data
-@TableName("sys_organize")
-public class Organize implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 组织编号
-     */
-    @TableField("organize_id")
-    private String organizeId;
-
-    /**
-     * 父级编号
-     */
-    @TableField("parent_id")
-    private String parentId;
-
-    /**
-     * 名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 归属区域
-     */
-    @TableField("region")
-    private String region;
-
-    /**
-     * 组织编码
-     */
-    @TableField("code")
-    private String code;
-
-    /**
-     * 组织类型（集团医院、医共、医联、医院）
-     */
-    @TableField("type")
-    private String type;
-
-    /**
-     * 排序
-     */
-    @TableField("order_no")
-    private String orderNo;
-
-    /**
-     * 状态 0:禁用，1：启用
-     */
-    @TableField("status")
-    private String status;
-
-    /**
-     * 创建者编号
-     */
-    @TableField("creator")
-    private Long creator;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-
-}

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

@@ -45,10 +45,10 @@ public class Role implements Serializable {
     private String status;
 
     /**
-     * 组织id
+     * 医院id
      */
-    @TableField("organize_id")
-    private String organizeId;
+    @TableField("hospital_id")
+    private Long hospitalId;
 
     /**
      * 创建用户id

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

@@ -26,6 +26,12 @@ public class User implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 医生id
+     */
+    @TableField("doctor_id")
+    private Long doctorId;
+
     /**
      * 用户名
      */

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/MenuInfoFacade.java

@@ -1,15 +0,0 @@
-package com.lantone.dblayermbg.facade;
-
-import com.lantone.dblayermbg.service.impl.MenuInfoServiceImpl;
-import org.springframework.stereotype.Component;
-
-
-/**
- * <p>
- * 菜单功能表 服务实现类Facade
- * </p>
- */
-@Component
-public class MenuInfoFacade extends MenuInfoServiceImpl {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/OrganizeFacade.java

@@ -1,14 +0,0 @@
-package com.lantone.dblayermbg.facade;
-
-import com.lantone.dblayermbg.service.impl.OrganizeServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * <p>
- * 组织表 服务实现类Facade
- * </p>
- */
-@Component
-public class OrganizeFacade extends OrganizeServiceImpl {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/UserFacade.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * <p>
- * 系统用户表 服务实现类Facade
+ * 用户表 服务实现类Facade
  * </p>
  */
 @Component

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

@@ -1,26 +0,0 @@
-package com.lantone.dblayermbg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.MenuInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 菜单功能表 Mapper 接口
- * </p>
- */
-public interface MenuInfoMapper extends BaseMapper<MenuInfo> {
-
-    /**
-     * @Author songxl
-     * @Description 通过用户id获取用户所有菜单id
-     * @Date 2021/7/20
-     * @Param [userId]
-     * @Return java.util.List<java.lang.Long>
-     * @MethodName queryAllMenuIdByUserId
-     */
-    List<Long> queryAllMenuIdByUserId(@Param("userID") Long userID, @Param("organizeID")String organizeId);
-}
-

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

@@ -1,14 +0,0 @@
-package com.lantone.dblayermbg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.Organize;
-
-/**
- * <p>
- * 组织表 Mapper 接口
- * </p>
- */
-public interface OrganizeMapper extends BaseMapper<Organize> {
-
-}
-

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

@@ -1,7 +1,7 @@
 package com.lantone.dblayermbg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.Organize;
+import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.Role;
 import com.lantone.dblayermbg.entity.User;
 import org.apache.ibatis.annotations.Param;
@@ -10,15 +10,13 @@ import java.util.List;
 
 /**
  * <p>
- * 系统用户表 Mapper 接口
+ * 用户表 Mapper 接口
  * </p>
  */
 public interface UserMapper extends BaseMapper<User> {
-
-
     List<User> getalle();
-    List<Organize> getUserOrganizeByUserID(Long userID);
+    List<Hospital> getUserOrganizeByUserID(Long userID);
 
-    List<Role> getUserRoleByUserID(@Param("userID") Long userID, @Param("organizeId")String organizeId);
+    List<Role> getUserRoleByUserID(@Param("userID") Long userID, @Param("organizeId")Long organizeId);
 }
 

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/MenuInfoService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.MenuInfo;
-
-/**
- * <p>
- * 菜单功能表 服务类
- * </p>
- */
-public interface MenuInfoService extends IService<MenuInfo> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/OrganizeService.java

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.Organize;
-
-/**
- * <p>
- * 组织表 服务类
- * </p>
- */
-public interface OrganizeService extends IService<Organize> {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/UserService.java

@@ -5,7 +5,7 @@ import com.lantone.dblayermbg.entity.User;
 
 /**
  * <p>
- * 系统用户表 服务类
+ * 用户表 服务类
  * </p>
  */
 public interface UserService extends IService<User> {

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/MenuInfoServiceImpl.java

@@ -1,18 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.MenuInfo;
-import com.lantone.dblayermbg.mapper.MenuInfoMapper;
-import com.lantone.dblayermbg.service.MenuInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 菜单功能表 服务实现类
- * </p>
- */
-@Service
-public class MenuInfoServiceImpl extends ServiceImpl<MenuInfoMapper, MenuInfo> implements MenuInfoService {
-
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/OrganizeServiceImpl.java

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.Organize;
-import com.lantone.dblayermbg.mapper.OrganizeMapper;
-import com.lantone.dblayermbg.service.OrganizeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 组织表 服务实现类
- * </p>
- */
-@Service
-public class OrganizeServiceImpl extends ServiceImpl<OrganizeMapper, Organize> implements OrganizeService {
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/UserServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 系统用户表 服务实现类
+ * 用户表 服务实现类
  * </p>
  */
 @Service

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.MenuInfoMapper">
-
-    <select id="queryAllMenuIdByUserId" resultType="java.lang.Long">
-        SELECT DISTINCT
-            m.id
-        FROM
-            sys_user_role ur,
-            sys_role r,
-            sys_role_system rs,
-            sys_role_system_menu rsm,
-            sys_menu_info m
-        WHERE
-            ur.role_id = r.id
-        AND ur.role_id = rs.role_id
-        AND rs.id = rsm.role_sys_id
-        AND rsm.menu_id = m.id
-        <if test="userID != null ">
-            AND ur.user_id = #{userID}
-        </if>
-        <if test="organizeID != null ">
-            AND r.organize_id = #{organizeID}
-        </if>
-    </select>
-</mapper>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.OrganizeMapper">
-
-</mapper>

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

@@ -7,19 +7,19 @@
         select * from sys_user
     </select>
 
-    <select id="getUserOrganizeByUserID" resultType="com.lantone.dblayermbg.entity.Organize">
+    <select id="getUserOrganizeByUserID" resultType="com.lantone.dblayermbg.entity.Hospital">
         SELECT
             organize.*
         FROM
             sys_user u,
-            sys_user_organize uorganize,
-            sys_organize organize
+            sys_user_hospital uh,
+            sys_hospital h
         WHERE
-            u.id = uorganize.user_id
-        AND organize.organize_id = uorganize.organize_id
+            u.id = uh.user_id
+        AND h.id = uh.hospital_id
         AND u.is_deleted = 'N'
-        AND uorganize.is_deleted = 'N'
-        AND organize.is_deleted = 'N'
+        AND uh.is_deleted = 'N'
+        AND h.is_deleted = 'N'
         <if test="userID != null ">
             AND u.id = #{userID}
         </if>

dblayer-mbg/src/main/resources/mapper/base/BaseMenuInfoMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.MenuInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.MenuInfo">
-        <id column="id" property="id"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="system_id" property="systemId"/>
-        <result column="name" property="name"/>
-        <result column="type" property="type"/>
-        <result column="url" property="url"/>
-        <result column="permission" property="permission"/>
-        <result column="icon" property="icon"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="status" property="status"/>
-        <result column="describe" property="describe"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseOrganizeMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.OrganizeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Organize">
-        <id column="id" property="id"/>
-        <result column="organize_id" property="organizeId"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="name" property="name"/>
-        <result column="region" property="region"/>
-        <result column="code" property="code"/>
-        <result column="type" property="type"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="status" property="status"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleMapper.xml

@@ -8,7 +8,7 @@
         <result column="name" property="name"/>
         <result column="remark" property="remark"/>
         <result column="status" property="status"/>
-        <result column="organize_id" property="organizeId"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="creator" property="creator"/>
         <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>

dblayer-mbg/src/main/resources/mapper/base/BaseUserMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.User">
         <id column="id" property="id"/>
+        <result column="doctor_id" property="doctorId"/>
         <result column="username" property="username"/>
         <result column="password" property="password"/>
         <result column="name" property="name"/>

security-center/src/main/java/com/lantone/security/dto/OrganizeDTO.java

@@ -11,7 +11,7 @@ import java.util.List;
  * </p>
  */
 @Data
-public class OrganizeDTO {
+public class HospitalDTO {
 
 
     /**

security-center/src/main/java/com/lantone/security/dto/JwtDTO.java

@@ -1,7 +1,5 @@
 package com.lantone.security.dto;
 
-import com.lantone.dblayermbg.entity.Organize;
-import com.lantone.dblayermbg.entity.Role;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,7 +19,7 @@ public class JwtDTO {
     private Integer type; //用户类型
     private String typeCn; //用户类型中文
     //用户组织列表
-    private List<OrganizeDTO> organizes;
+    private List<HospitalDTO> organizes;
     //用户密码复杂度是否符合
 //    private String passwordComplexity;
 }

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

@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
-import com.lantone.dblayermbg.entity.Organize;
+import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.Role;
 import com.lantone.dblayermbg.entity.User;
 import com.lantone.dblayermbg.entity.UserRole;
@@ -19,7 +17,7 @@ import com.lantone.security.dto.JWT;
 import com.lantone.security.dto.JwtDTO;
 import com.lantone.security.dto.JwtStore;
 import com.lantone.security.dto.MenuInfoDTO;
-import com.lantone.security.dto.OrganizeDTO;
+import com.lantone.security.dto.HospitalDTO;
 import com.lantone.security.enums.StatusEnum;
 import com.lantone.security.exception.ServiceErrorCode;
 import com.lantone.security.util.SysUserUtils;
@@ -90,18 +88,18 @@ public class UserLoginFacade extends UserServiceImpl {
         data.setRefreshToken(jwt.getRefresh_token());
         //获取用户组织信息
         Long id = user.getId();
-        List<Organize> organizes = this.baseMapper.getUserOrganizeByUserID(id);
-        if (organizes != null && !organizes.isEmpty()) {
-            List<OrganizeDTO> organizeDTOS = new ArrayList<>();
+        List<Hospital> hospitals = this.baseMapper.getUserOrganizeByUserID(id);
+        if (ListUtil.isNotEmpty(hospitals)) {
+            List<HospitalDTO> organizeDTOS = new ArrayList<>();
             //获取用户当前组织下的角色信息
-            for (Organize organize : organizes) {
-                OrganizeDTO organizeDTO = new OrganizeDTO();
-                BeanUtils.copyProperties(organize,organizeDTO);
-                if(StringUtil.isNotBlank(organize.getOrganizeId())){
-                    List<Role> roles= this.baseMapper.getUserRoleByUserID(id,organize.getOrganizeId());
-                    organizeDTO.setRoles(roles);
+            for (Hospital hospital: hospitals) {
+                HospitalDTO hospitalDTO = new HospitalDTO();
+                BeanUtils.copyProperties(hospital,hospitalDTO);
+                if(hospital.getId()!=null){
+                    List<Role> roles= this.baseMapper.getUserRoleByUserID(id,hospital.getId());
+                    hospitalDTO.setRoles(roles);
                 }
-                organizeDTOS.add(organizeDTO);
+                organizeDTOS.add(hospitalDTO);
             }
             data.setOrganizes(organizeDTOS);
         }

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

@@ -3,8 +3,6 @@ package com.lantone.security.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.enums.IsDeleteEnum;
 import com.lantone.common.util.ListUtil;
-import com.lantone.dblayermbg.entity.MenuInfo;
-import com.lantone.dblayermbg.service.impl.MenuInfoServiceImpl;
 import com.lantone.security.dto.MenuInfoDTO;
 import com.lantone.security.enums.ConstantEnum;
 import com.lantone.security.enums.StatusEnum;
@@ -20,83 +18,83 @@ import java.util.List;
  * @Date 2021/7/19
  * @Version 1.0
  */
-public class UserMenuInfoFacade extends MenuInfoServiceImpl {
+public class UserMenuInfoFacade  {
 
-    /**
-     * @Author songxl
-     * @Description 获取用户显示的菜单
-     * @Date 2021/7/20
-     * @Param [userId]
-     * @Return java.util.List<com.lantone.security.dto.MenuInfoDTO>
-     * @MethodName getUserMenuList
-     */
-    public List<MenuInfoDTO> getUserMenuList(Long userId) {
-
-        //系统管理员，拥有最高权限
-        if (userId.intValue() == ConstantEnum.SUPER_USER.getKey()) {
-            return getAllMenuList(null);
-        }
-
-        //用户菜单列表
-        List<Long> menuIdList = this.baseMapper.queryAllMenuIdByUserId(userId, null);
-        return getAllMenuList(menuIdList);
-    }
-
-    /**
-     * @Author songxl
-     * @Description 获取所有菜单列表
-     * @Date 2021/7/20
-     * @Param [menuIdList]
-     * @Return java.util.List<com.lantone.security.dto.MenuInfoDTO>
-     * @MethodName getAllMenuList
-     */
-    private List<MenuInfoDTO> getAllMenuList(List<Long> menuIdList) {
-        //查询根菜单列表
-        List<MenuInfoDTO> menuList = queryListParentId(0L, menuIdList);
-        //递归获取子菜单
-        getMenuTreeList(menuList, menuIdList);
-
-        return menuList;
-    }
-
-    /**
-     * 递归
-     */
-    private List<MenuInfoDTO> getMenuTreeList(List<MenuInfoDTO> menuList, List<Long> menuIdList) {
-        List<MenuInfoDTO> subMenuList = new ArrayList();
-
-        for (MenuInfoDTO menuInfoDTO : menuList) {
-            menuInfoDTO.setSonMenuInfo(getMenuTreeList(queryListParentId(menuInfoDTO.getId(), menuIdList), menuIdList));
-            subMenuList.add(menuInfoDTO);
-        }
-
-        return subMenuList;
-    }
-
-    public List<MenuInfoDTO> queryListParentId(Long parentId, List<Long> menuIdList) {
-        List<MenuInfo> menuListEntity = this.list(new QueryWrapper<MenuInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("parent_id", parentId));
-        List<MenuInfoDTO> menuList = new ArrayList<>();
-        if (ListUtil.isNotEmpty(menuListEntity)) {
-            menuListEntity.stream().forEach(menuInfo -> {
-                MenuInfoDTO menuInfoDTO = new MenuInfoDTO();
-                BeanUtils.copyProperties(menuInfo, menuInfoDTO);
-                menuList.add(menuInfoDTO);
-            });
-        }
-
-        if (menuIdList == null) {
-            return menuList;
-        }
-
-        List<MenuInfoDTO> userMenuList = new ArrayList<>();
-        for (MenuInfoDTO menu : menuList) {
-            if (menuIdList.contains(menu.getId())) {
-                userMenuList.add(menu);
-            }
-        }
-        return userMenuList;
-    }
+//    /**
+//     * @Author songxl
+//     * @Description 获取用户显示的菜单
+//     * @Date 2021/7/20
+//     * @Param [userId]
+//     * @Return java.util.List<com.lantone.security.dto.MenuInfoDTO>
+//     * @MethodName getUserMenuList
+//     */
+//    public List<MenuInfoDTO> getUserMenuList(Long userId) {
+//
+//        //系统管理员，拥有最高权限
+//        if (userId.intValue() == ConstantEnum.SUPER_USER.getKey()) {
+//            return getAllMenuList(null);
+//        }
+//
+//        //用户菜单列表
+//        List<Long> menuIdList = this.baseMapper.queryAllMenuIdByUserId(userId, null);
+//        return getAllMenuList(menuIdList);
+//    }
+//
+//    /**
+//     * @Author songxl
+//     * @Description 获取所有菜单列表
+//     * @Date 2021/7/20
+//     * @Param [menuIdList]
+//     * @Return java.util.List<com.lantone.security.dto.MenuInfoDTO>
+//     * @MethodName getAllMenuList
+//     */
+//    private List<MenuInfoDTO> getAllMenuList(List<Long> menuIdList) {
+//        //查询根菜单列表
+//        List<MenuInfoDTO> menuList = queryListParentId(0L, menuIdList);
+//        //递归获取子菜单
+//        getMenuTreeList(menuList, menuIdList);
+//
+//        return menuList;
+//    }
+//
+//    /**
+//     * 递归
+//     */
+//    private List<MenuInfoDTO> getMenuTreeList(List<MenuInfoDTO> menuList, List<Long> menuIdList) {
+//        List<MenuInfoDTO> subMenuList = new ArrayList();
+//
+//        for (MenuInfoDTO menuInfoDTO : menuList) {
+//            menuInfoDTO.setSonMenuInfo(getMenuTreeList(queryListParentId(menuInfoDTO.getId(), menuIdList), menuIdList));
+//            subMenuList.add(menuInfoDTO);
+//        }
+//
+//        return subMenuList;
+//    }
+//
+//    public List<MenuInfoDTO> queryListParentId(Long parentId, List<Long> menuIdList) {
+//        List<MenuInfo> menuListEntity = this.list(new QueryWrapper<MenuInfo>()
+//                .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                .eq("status", StatusEnum.Enable.getKey())
+//                .eq("parent_id", parentId));
+//        List<MenuInfoDTO> menuList = new ArrayList<>();
+//        if (ListUtil.isNotEmpty(menuListEntity)) {
+//            menuListEntity.stream().forEach(menuInfo -> {
+//                MenuInfoDTO menuInfoDTO = new MenuInfoDTO();
+//                BeanUtils.copyProperties(menuInfo, menuInfoDTO);
+//                menuList.add(menuInfoDTO);
+//            });
+//        }
+//
+//        if (menuIdList == null) {
+//            return menuList;
+//        }
+//
+//        List<MenuInfoDTO> userMenuList = new ArrayList<>();
+//        for (MenuInfoDTO menu : menuList) {
+//            if (menuIdList.contains(menu.getId())) {
+//                userMenuList.add(menu);
+//            }
+//        }
+//        return userMenuList;
+//    }
 }