租户的修改

authentication/src/main/java/com/jzg/entity/SysUser.java

@@ -1,10 +1,7 @@
 package com.jzg.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jdk.jfr.DataAmount;
 import lombok.Data;
 
 @Schema(description = "核心用户表")

commons/pom.xml

@@ -45,5 +45,9 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
     </dependencies>
 </project>

commons/src/main/java/com/jzg/util/TreeBuildUtils.java

@@ -0,0 +1,79 @@
+package com.jzg.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNodeConfig;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.lang.tree.parser.NodeParser;
+import com.jzg.util.reflect.ReflectUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 扩展 hutool TreeUtil 封装系统树构建
+ *
+ * @author dongxin
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class TreeBuildUtils extends TreeUtil {
+
+    /**
+     * 根据前端定制差异化字段
+     */
+    public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label");
+
+    /**
+     * 构建树形结构
+     *
+     * @param <T>        输入节点的类型
+     * @param <K>        节点ID的类型
+     * @param list       节点列表，其中包含了要构建树形结构的所有节点
+     * @param nodeParser 解析器，用于将输入节点转换为树节点
+     * @return 构建好的树形结构列表
+     */
+    public static <T, K> List<Tree<K>> build(List<T> list, NodeParser<T, K> nodeParser) {
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        K k = ReflectUtils.invokeGetter(list.get(0), "parentId");
+        return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser);
+    }
+
+    /**
+     * 获取节点列表中所有节点的叶子节点
+     *
+     * @param <K>   节点ID的类型
+     * @param nodes 节点列表
+     * @return 包含所有叶子节点的列表
+     */
+    public static <K> List<Tree<K>> getLeafNodes(List<Tree<K>> nodes) {
+        if (CollUtil.isEmpty(nodes)) {
+            return CollUtil.newArrayList();
+        }
+        return nodes.stream()
+            .flatMap(TreeBuildUtils::extractLeafNodes)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取指定节点下的所有叶子节点
+     *
+     * @param <K>  节点ID的类型
+     * @param node 要查找叶子节点的根节点
+     * @return 包含所有叶子节点的列表
+     */
+    private static <K> Stream<Tree<K>> extractLeafNodes(Tree<K> node) {
+        if (!node.hasChild()) {
+            return Stream.of(node);
+        } else {
+            // 递归调用，获取所有子节点的叶子节点
+            return node.getChildren().stream()
+                .flatMap(TreeBuildUtils::extractLeafNodes);
+        }
+    }
+
+}

commons/src/main/java/com/jzg/util/reflect/ReflectUtils.java

@@ -0,0 +1,56 @@
+package com.jzg.util.reflect;
+
+import cn.hutool.core.util.ReflectUtil;
+import com.jzg.util.StringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.lang.reflect.Method;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ *
+ * @author dongxin
+ */
+@SuppressWarnings("rawtypes")
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ReflectUtils extends ReflectUtil {
+
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName) {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, ".")) {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invoke(object, getterMethodName);
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++) {
+            if (i < names.length - 1) {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invoke(object, getterMethodName);
+            } else {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                Method method = getMethodByName(object.getClass(), setterMethodName);
+                invoke(object, method, value);
+            }
+        }
+    }
+
+}

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -1,5 +1,6 @@
 package com.jzg.controller;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.annotation.Log;
 import com.jzg.core.page.HttpResult;
@@ -128,4 +129,10 @@ public class SysSystemController {
                           @PathVariable Long[] ids) {
         return HttpResult.ok(sysSystemService.deleteWithValidByIds(List.of(ids)));
     }
+
+//    @Operation(summary = "租户机构树形查询")
+//    @GetMapping("/deptTree")
+//    public HttpResult deptTree(String systemCode) {
+//        return HttpResult.ok(deptService.selectDeptTreeList(systemCode));
+//    }
 }

platform/src/main/java/com/jzg/controller/SysUserController.java

@@ -1,18 +1,51 @@
 package com.jzg.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.core.base.BaseController;
+import com.jzg.core.page.HttpResult;
+import com.jzg.entity.vo.SysSystemVo;
+import com.jzg.entity.vo.SysUserVo;
+import com.jzg.service.SysUserService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
  * 系统用户管理
  */
-@Tag(name="用户接口")
+@Tag(name="平台用户管理")
 @RestController
-@RequestMapping("/userRole")
-public class SysUserController {
+@RequestMapping("/user")
+public class SysUserController extends BaseController {
 
 
+    @Autowired
+    private SysUserService sysUserService;
+
+    /**
+     * 平台用户列表
+     * @param sysUserVo
+     * @return
+     */
+    @PostMapping("/userList")
+    @Operation(summary = "平台用户列表")
+    public HttpResult sysList(@RequestBody SysUserVo sysUserVo){
+        Page page = sysUserVo.getPage();
+        return HttpResult.ok(sysUserService.queryPage(page,sysUserVo));
+    }
+
+    /**
+     * 平台用户信息查询
+     * @param id
+     * @return
+     */
+    @GetMapping(value = { "/userGet"})
+    @Operation(summary = "租户信息查询")
+    public HttpResult userGet(@RequestBody String id) {
+        return HttpResult.ok(sysUserService.queryById(id));
+    }
+
 
 }

platform/src/main/java/com/jzg/entity/po/SysRole.java

@@ -17,4 +17,11 @@ public class SysRole extends BaseModel {
     private String name;
 
     private String remark;
+
+    /** 非数据库字段 */
+
+    /** 用户ID */
+    @TableField(exist = false)
+    private String userId;
+
 }

platform/src/main/java/com/jzg/entity/po/SysUser.java

@@ -0,0 +1,51 @@
+package com.jzg.entity.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.jzg.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 核心用户管理表实体 sys_user
+ *
+ * @author dongxin
+ */
+@Schema(description = "用户管理表")
+@Data
+public class SysUser extends BaseModel{
+
+    /** 用户id */
+    @Schema(description = "用户id")
+    private String id;
+
+    /** 用户名 */
+    @Schema(description = "用户名")
+    private String username;
+
+    /** 密码 */
+    @Schema(description = "密码")
+    private String password;
+
+    /** 盐 */
+    @Schema(description = "盐")
+    private String salt;
+
+    /** 手机号 */
+    @Schema(description = "手机号")
+    private String mobile;
+
+    /** 用户状态 : 1 正常 0 锁定 */
+    @Schema(description = "用户状态 : 1 正常 0 锁定")
+    private Integer accountStatus;
+
+    /** 系统code */
+    @Schema(description = "系统code")
+    private String systemCode;
+
+    /** 非数据库字段 */
+
+    /** 角色名称集合 */
+    private String roleNames;
+}

platform/src/main/java/com/jzg/entity/vo/SysSystemVo.java

@@ -40,6 +40,11 @@ public class SysSystemVo extends PageRequest {
     @NotNull(message = "管理员账号不能为空")
     private String userAccount;
 
+    @Schema(description = "管理员手机号")
+    @Size(min=1,max=20,message = "管理员账号长度不能大于20")
+    @NotNull(message = "管理员手机号不能为空")
+    private String mobile;
+
     @Schema(description = "登录密码")
     @Size(min=8,max=20,message = "登录密码长度不能大于20,不能小于8")
     @NotNull(message = "登录密码不能为空")

platform/src/main/java/com/jzg/entity/vo/SysUserVo.java

@@ -0,0 +1,22 @@
+package com.jzg.entity.vo;
+
+import com.jzg.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "平台用户表VO")
+@Data
+public class SysUserVo extends PageRequest {
+
+    @Schema(description = "平台用户id")
+    private String id;
+
+    /** 用户状态 : 1 正常 0 锁定 */
+    @Schema(description = "用户状态 : 1 正常 0 锁定")
+    private Integer accountStatus;
+
+    /** 用户信息搜索值 */
+    @Schema(description = "用户信息搜索值")
+    private String searchValue;
+
+}

platform/src/main/java/com/jzg/mapper/SysRoleMapper.java

@@ -2,8 +2,10 @@ package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.entity.po.SysRole;
+import com.jzg.entity.po.SysUserRole;
 import com.jzg.entity.vo.RolePermissionVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,4 +14,11 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
 
     public List<RolePermissionVo> getAllRoleMenu();
 
+    /**
+     * 根据用户idLIST查询角色信息
+     * @param userIdList
+     * @return
+     */
+    List<SysRole> queryByUserIds(@Param("idList") List<String> userIdList);
+
 }

platform/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -0,0 +1,20 @@
+package com.jzg.mapper;
+
+import com.jzg.entity.po.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author dongxin
+* @description 针对表【sys_user(核心用户表)】的数据库操作Mapper
+* @createDate 2025-01-13 10:53:51
+* @Entity generator.domain.SysUser
+*/
+@Mapper
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}
+
+
+
+

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -26,6 +26,11 @@ public interface SysSystemService extends IService<SysSystem> {
      */
     public boolean updatePerms(SysSystemPermsVo sysSystemPermsVo);
 
+    /**
+     * 获取租户权限
+     * @param systemCode
+     * @return
+     */
     public List<SysSystemPerms> getSystemPerms(String systemCode);
 
     /**
@@ -58,40 +63,40 @@ public interface SysSystemService extends IService<SysSystem> {
      * @param sysSystemVo
      * @return
      */
-    Page<SysSystem> queryPage(Page page, SysSystemVo sysSystemVo);
+    public Page<SysSystem> queryPage(Page page, SysSystemVo sysSystemVo);
 
     /**
      * 租户明细
      * @param sysId
      * @return
      */
-    String queryById(String sysId);
+    public String queryById(String sysId);
 
     /**
      * 租户新增
      * @param sysSystemVo
      * @return
      */
-    boolean sysAdd(SysSystemVo sysSystemVo);
+    public boolean sysAdd(SysSystemVo sysSystemVo);
 
     /**
      * 租户修改
      * @param sysSystemVo
      * @return
      */
-    boolean sysEdit(SysSystemVo sysSystemVo);
+    public boolean sysEdit(SysSystemVo sysSystemVo);
 
     /**
      * 租户状态修改 （0-停用 1-在用）
      * @param sysSystemVo
      * @return
      */
-    boolean changeStatus(SysSystemVo sysSystemVo);
+    public boolean changeStatus(SysSystemVo sysSystemVo);
 
     /**
      * 批量删除租户信息
      * @param ids
      * @return
      */
-    boolean deleteWithValidByIds(List<@NotEmpty(message = "主键不能为空") Long> ids);
+    public boolean deleteWithValidByIds(List<@NotEmpty(message = "主键不能为空") Long> ids);
 }

platform/src/main/java/com/jzg/service/SysUserService.java

@@ -0,0 +1,31 @@
+package com.jzg.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.entity.po.SysUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.entity.vo.SysUserVo;
+
+import java.util.List;
+
+/**
+* @author dongxin
+* @description 针对表【sys_user(核心用户表)】的数据库操作Service
+* @createDate 2025-01-13 10:53:51
+*/
+public interface SysUserService extends IService<SysUser> {
+
+    /**
+     * 平台用户分页列表
+     * @param page
+     * @param sysUserVo
+     * @return
+     */
+    public Page<SysUser> queryPage(Page page, SysUserVo sysUserVo);
+
+    /**
+     * 平台用户信息查询
+     * @param id
+     * @return
+     */
+    public List<SysUser> queryById(String id);
+}

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -34,7 +34,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     implements SysSystemService {
 
     @Autowired
-    SysSystemPermsMapper sysSystemPermsMapper;
+    private SysSystemPermsMapper sysSystemPermsMapper;
 
     @Override
     public boolean updatePerms(SysSystemPermsVo sysSystemPermsVo) {
@@ -124,12 +124,24 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     public boolean sysAdd(SysSystemVo sysSystemVo) {
         SysSystem sysSystem = new SysSystem();
         BeanUtils.copyProperties(sysSystemVo, sysSystem);
+        this.save(sysSystem);
+        /** 初始化租户管理员信息 */
+        return this.initAdmin(sysSystem);
+    }
 
-        // 新增管理员信息
+    /**
+     * 初始化租户管理员信息
+     * @param sysSystem
+     * @return
+     */
+    private boolean initAdmin(SysSystem sysSystem) {
+        boolean flag = false;
+        // 新增管理员用户
 
-        // 初始化租户基本信息
+        // 新增管理员角色
 
-        return save(sysSystem);
+        // 关联用户角色
+        return flag;
     }
 
     @Override

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jzg.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.entity.po.SysRole;
+import com.jzg.entity.po.SysUser;
+import com.jzg.entity.po.SysUserRole;
+import com.jzg.entity.vo.SysUserVo;
+import com.jzg.mapper.SysRoleMapper;
+import com.jzg.mapper.SysUserMapper;
+import com.jzg.mapper.SysUserRoleMapper;
+import com.jzg.service.SysUserService;
+import com.jzg.util.StringUtils;
+import jodd.util.CollectionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+* @author dongxin
+* @description 针对表【sys_user(核心用户表)】的数据库操作Service实现
+* @createDate 2025-01-13 10:53:51
+*/
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
+    implements SysUserService {
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    @Override
+    public Page<SysUser> queryPage(Page page, SysUserVo sysUserVo) {
+        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotNull(sysUserVo.getAccountStatus()), SysUser::getAccountStatus, sysUserVo.getAccountStatus())
+                .eq(StringUtils.isNotEmpty(sysUserVo.getSearchValue()), SysUser::getUsername, sysUserVo.getSearchValue()).or()
+                .eq(StringUtils.isNotEmpty(sysUserVo.getSearchValue()), SysUser::getMobile, sysUserVo.getSearchValue()).or()
+                .eq(StringUtils.isNotEmpty(sysUserVo.getSearchValue()), SysUser::getId, sysUserVo.getSearchValue());
+        Page<SysUser> userPage = page(page, wrapper);
+        List<SysUser> userList = userPage.getRecords();
+        if (!userList.isEmpty()) {
+            List<String> userIdList = userList.stream().map(user -> user.getId()).collect(Collectors.toList());
+            // 批量查询 角色信息
+            List<SysRole> roles  = sysRoleMapper.queryByUserIds(userIdList);
+            Map<String,String> nameMap = roles.stream()
+                    .collect(Collectors.toMap(item -> item.getUserId(), item -> item.getName(),
+                            (v1,v2) -> v1 + ',' + v2));
+            userList.forEach(sysUser -> {
+                if(nameMap.containsKey(sysUser.getId())){
+                    sysUser.setRoleNames(nameMap.get(sysUser.getId()));
+                }
+            });
+        }
+        return userPage;
+    }
+
+    @Override
+    public List<SysUser> queryById(String id) {
+        SysUser user = this.baseMapper.selectById(id);
+
+        return List.of();
+    }
+}
+
+
+
+

platform/src/main/resources/mapper/SysRoleMapper.xml

@@ -34,4 +34,19 @@
                 LEFT JOIN sys_role sr ON sr.system_code = ss.sys_code
                 LEFT JOIN sys_role_perms srp ON sr.id = srp.role_id
     </select>
+    <select id="queryByUserIds" resultType="com.jzg.entity.po.SysRole">
+        SELECT
+            sur.user_id, sur.`name`
+        FROM
+            sys_user_role sur
+                LEFT JOIN sys_role sr ON sur.role_id = sr.id
+        <where>
+            <if test="idList != null and idList.size()" >
+                AND sur.user_id in
+                <foreach collection="idList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -0,0 +1,28 @@
+<?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.jzg.mapper.SysUserMapper">
+
+    <resultMap id="SysUserResult" type="com.jzg.entity.po.SysUser">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="username" column="username" jdbcType="VARCHAR"/>
+            <result property="password" column="password" jdbcType="VARCHAR"/>
+            <result property="salt" column="salt" jdbcType="VARCHAR"/>
+            <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+            <result property="accountStatus" column="account_status" jdbcType="TINYINT"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+            <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,username,password,
+        salt,mobile,account_status,
+        create_by,create_time,update_by,
+        update_time,is_delete,system_code
+    </sql>
+</mapper>

pom.xml

@@ -32,6 +32,7 @@
     <fastjson.version>2.0.43</fastjson.version>
     <cloud.version>2022.0.0</cloud.version>
     <openfeign.version>4.1.3</openfeign.version>
+    <hutool.version>5.8.31</hutool.version>
     <minio.version>8.0.3</minio.version>
   </properties>
 
@@ -168,6 +169,17 @@
         <artifactId>fastjson2</artifactId>
         <version>${fastjson.version}</version>
       </dependency>
+
+      <!--    Hutool是一个小而全的Java工具类库    -->
+      <dependency>
+        <groupId>cn.hutool</groupId>
+        <artifactId>hutool-bom</artifactId>
+        <version>${hutool.version}</version>
+        <type>pom</type>
+        <!-- 注意这里是import -->
+        <scope>import</scope>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 

tenant/organization/src/main/java/com/jzg/organization/entity/po/SysDept.java

@@ -94,6 +94,10 @@ public class SysDept implements Serializable {
     @Schema(description = "子公司C,门店M,部门D")
     private String deptType;
 
+    /** 系统code */
+    @Schema(description = "系统code")
+    private String systemCode;
+
     /**
      * @see com.jzg.constants.ManagementSourceEnum
      */

tenant/organization/src/main/java/com/jzg/organization/mapper/SysDeptMapper.java

@@ -1,13 +1,23 @@
 package com.jzg.organization.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.jzg.organization.entity.po.SysDept;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface SysDeptMapper extends BaseMapper<SysDept> {
 
     String getMaxId(@Param(value = "deptId") String deptId, @Param(value = "deptType")String deptType, @Param(value = "comLevel")String comLevel);
 
+    /**
+     * 查询机构管理数据
+     * @param queryWrapper
+     * @return
+     */
+    List<SysDept> selectDeptList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
 }

tenant/organization/src/main/java/com/jzg/organization/service/DeptService.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.core.page.HttpResult;
 import com.jzg.organization.entity.po.SysDept;
@@ -37,4 +38,19 @@ public interface DeptService extends IService<SysDept> {
      * 机构树
      */
     List<SysDept> getDeptTree(String deptId);
+
+    /**
+     * 查询租户部门树结构信息
+     * @param systemCode
+     * @return
+     */
+    List<Tree<String>> selectDeptTreeList(String systemCode);
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 机构列表
+     * @return 下拉树结构列表
+     */
+    List<Tree<String>> buildDeptTreeSelect(List<SysDept> depts);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/DeptServiceImpl.java

@@ -1,6 +1,9 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.core.page.HttpResult;
 import com.jzg.exception.SystemException;
@@ -9,6 +12,7 @@ import com.jzg.organization.entity.vo.SysDeptVo;
 import com.jzg.organization.mapper.SysDeptMapper;
 import com.jzg.organization.service.DeptService;
 import com.jzg.util.AssertionUtils;
+import com.jzg.util.TreeBuildUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -254,4 +258,38 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
         sysDeptList.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
         return map.get(sysDept.getParentId());
     }
+
+    @Override
+    public List<Tree<String>> selectDeptTreeList(String systemCode) {
+        LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(systemCode);
+        List<SysDept> depts = baseMapper.selectDeptList(lqw);
+        return buildDeptTreeSelect(depts);
+    }
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 机构列表
+     * @return 下拉树结构列表
+     */
+    @Override
+    public List<Tree<String>> buildDeptTreeSelect(List<SysDept> depts) {
+        if (CollUtil.isEmpty(depts)) {
+            return CollUtil.newArrayList();
+        }
+        return TreeBuildUtils.build(depts, (dept, tree) ->
+                tree.setId(dept.getId())
+                        .setParentId(dept.getParentId())
+                        .setName(dept.getName())
+                        .setWeight(dept.getOrderNum()));
+    }
+
+    private LambdaQueryWrapper<SysDept> buildQueryWrapper(String systemCode) {
+        LambdaQueryWrapper<SysDept> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SysDept::getSystemCode, systemCode);
+        lqw.eq(SysDept::getDelFlag, 0);
+        lqw.orderByAsc(SysDept::getParentId);
+        lqw.orderByAsc(SysDept::getOrderNum);
+        return lqw;
+    }
 }

tenant/organization/src/main/resources/mapper/SysDeptMapper.xml

@@ -9,4 +9,15 @@
             and comlevel = #{comlevel}
         </if>
     </select>
-</mapper>
+
+    <select id="selectDeptList" resultType="com.jzg.organization.entity.po.SysDept">
+        select
+        <if test="ew.getSqlSelect != null">
+            ${ew.getSqlSelect}
+        </if>
+        <if test="ew.getSqlSelect == null">
+            *
+        </if>
+        from sys_dept ${ew.getCustomSqlSegment}
+    </select>
+</mapper>