租户机构和租户用户的修改

commons/src/main/java/com/jzg/commons/config/MultiTenantHandler.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.config;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.TenantContext;
 import com.jzg.commons.entity.properties.TenantProperties;
@@ -70,10 +71,9 @@ public class MultiTenantHandler implements TenantLineHandler {
 
         // 平台默认忽略租户数据过滤
         String system = controller.getUserLoginSystem();
-        if("PLATFORM".equals(system)) {
+        if (SystemConstants.SYSTEM_PLATFORM.getCode().equals(system)) {
             return true;
         }
-
         // 可以自行增加一些校验比如获取不到用户就直接 return false 之类的。
         List<String> ignoreLoginNames = properties.getIgnoreLoginNames();
         // 忽略指定用户对租户的数据过滤

commons/src/main/java/com/jzg/commons/entity/dto/SysDeptParam.java

@@ -0,0 +1,13 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "平台机构查询dto")
+@Data
+public class SysDeptParam {
+
+    /** 用户信息搜索值 */
+    @Schema(description = "系统code")
+    private String sysCode;
+}

commons/src/main/java/com/jzg/commons/entity/dto/SysUserParam.java

@@ -8,9 +8,9 @@ import lombok.Data;
 @Data
 public class SysUserParam extends PageRequest {
 
-    /** 用户状态 : 1 正常 0 锁定 */
-    @Schema(description = "用户状态 : 1 正常 0 锁定")
-    private Integer accountStatus;
+    /** 是否启用 1 启用 0禁用 */
+    @Schema(description = "是否启用 1 启用 0禁用")
+    private Integer isEnable;
 
     /** 用户信息搜索值 */
     @Schema(description = "用户信息搜索值")

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -3,6 +3,9 @@ package com.jzg.commons.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -40,6 +43,11 @@ public class SysUserJzgInfo extends BaseModel {
     @Schema(description = "系统code")
     private String systemCode;
 
+    /** 状态  1：正常   0：删除 2：审批中  3：审批不通过 */
+    @Schema(description = "状态  1：正常   0：删除 2：审批中  3：审批不通过")
+    private Integer status;
+
+    /** 机构ID */
     @TableField(value = "dept_id")
     @Schema(description = "机构id")
     private String deptId;
@@ -208,4 +216,5 @@ public class SysUserJzgInfo extends BaseModel {
     @Schema(description = "身份证反面")
     private String idCardDown;
 
+
 }

commons/src/main/java/com/jzg/commons/entity/po/SysUserPlateInfo.java

@@ -0,0 +1,53 @@
+package com.jzg.commons.entity.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.jzg.commons.constants.SystemConstants;
+import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.entity.enums.YesNoEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 平台用户信息表实体 sys_user_plate_info
+ *
+ * @author dongxin
+ */
+@Schema(description = "用户信息表实体")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserPlateInfo extends BaseModel {
+    /**
+     * 
+     */
+    private String id;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 系统code
+     */
+    private String systemCode;
+
+    /**
+     * 是否启用 1 启用 0禁用
+     */
+    private Integer isEnable;
+
+    /**
+     * 初始化平台用户信息
+     * @param userId
+     */
+    public SysUserPlateInfo(String userId){
+        this.userId = userId;
+        this.systemCode = SystemConstants.SYSTEM_PLATFORM.getCode();
+        this.isEnable = YesNoEnum.YES.getCode();
+    }
+}

commons/src/main/java/com/jzg/commons/entity/po/SysUserRole.java

@@ -11,4 +11,6 @@ public class SysUserRole {
 
     private String roleId;
 
+    private String name;
+
 }

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

@@ -24,10 +24,6 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "用户状态 : 1 正常 0 锁定")
     private Integer accountStatus;
 
-    /** 用户信息搜索值 */
-    @Schema(description = "用户信息搜索值")
-    private String searchValue;
-
     /** 用户名 */
     @Schema(description = "用户名")
     private String username;
@@ -40,12 +36,13 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "手机号")
     private String mobile;
 
-    @Schema(description = "角色列表")
-    private List<SysRoleVo> roleVoList;
-
     /** 角色名称集合 */
     @Schema(description = "角色名称集合")
-    private String roleNames;
+    private List<String> roleNameList;
+
+    /** 是否启用 1 启用 0禁用 */
+    @Schema(description = "是否启用 1 启用 0禁用")
+    private Integer isEnable;
 
     @Schema(description = "部门id")
     private String deptId;
@@ -145,6 +142,9 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "用户类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队长 6:个代 7：电销 8 渠道")
     private String typeAttr;
 
+    @Schema(description = "平台信息id")
+    private String userInfoId;
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

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

@@ -50,7 +50,7 @@ public class SysUserController extends BaseController {
      */
     @GetMapping(value = { "/userGet"})
     @Operation(summary = "平台用户信息查询")
-    public HttpResult userGet(@RequestBody String id) {
+    public HttpResult userGet(String id) {
         return HttpResult.ok(sysUserService.queryById(id));
     }
 
@@ -95,7 +95,7 @@ public class SysUserController extends BaseController {
     public HttpResult remove(String[] ids) {
         // 校验用户是不是管理员
         Boolean userValid = sysUserService.userDeleteValid(List.of(ids));
-        AssertionUtils.isFail(userValid,"管理员不可操作离职！");
+        AssertionUtils.isFail(!userValid,"管理员不可操作离职！");
         return HttpResult.ok(sysUserService.deleteByIds(List.of(ids))? "删除成功":"删除失败");
     }
 
@@ -104,7 +104,7 @@ public class SysUserController extends BaseController {
      * @param upAndDownVo
      * @return
      */
-    @PostMapping("/upAndDown/")
+    @PostMapping("/upAndDown")
     @Operation(summary = "启用/禁用平台用户")
     public HttpResult upAndDown(@RequestBody UpAndDownVo upAndDownVo) {
         sysUserService.upAndDown(upAndDownVo);

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

@@ -2,6 +2,7 @@ package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysUserRole;
 import com.jzg.commons.entity.vo.RolePermissionVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,6 +19,6 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      * @param userIdList
      * @return
      */
-    List<SysRole> queryByUserIds(@Param("idList") List<String> userIdList);
+    List<SysUserRole> queryByUserIds(@Param("idList") List<String> userIdList);
 
 }

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

@@ -0,0 +1,20 @@
+package com.jzg.mapper;
+
+import com.jzg.commons.entity.po.SysUserPlateInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author dongxin
+* @description 针对表【sys_user_plate_info(平台用户信息表)】的数据库操作Mapper
+* @createDate 2025-01-18 15:39:54
+* @Entity generator.domain.SysUserPlateInfo
+*/
+@Mapper
+public interface SysUserPlateInfoMapper extends BaseMapper<SysUserPlateInfo> {
+
+}
+
+
+
+

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

@@ -1,9 +1,21 @@
 package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysRole;
+import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.po.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+    /**
+     * 根据用户idLIST查询角色信息
+     * @param userIdList
+     * @return
+     */
+    List<SysUserRole> queryByUserIds(@Param("idList") List<String> userIdList);
 }

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

@@ -6,21 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.entity.dto.SysUserAddParam;
 import com.jzg.commons.entity.dto.SysUserEditParam;
 import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
-import com.jzg.commons.entity.po.SysRole;
-import com.jzg.commons.entity.po.SysUser;
-import com.jzg.commons.entity.po.SysUserJzgInfo;
-import com.jzg.commons.entity.po.SysUserRole;
+import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.mapper.SysRoleMapper;
-import com.jzg.mapper.SysUserJzgInfoMapper;
-import com.jzg.mapper.SysUserMapper;
-import com.jzg.mapper.SysUserRoleMapper;
+import com.jzg.mapper.*;
 import com.jzg.service.SysUserService;
 import com.jzg.commons.util.PasswordUtils;
 import org.springframework.beans.BeanUtils;
@@ -47,22 +42,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
     @Autowired
-    private SysUserJzgInfoMapper sysUserJzgInfoMapper;
+    private SysUserPlateInfoMapper sysUserPlateInfoMapper;
 
     @Override
     public Page<SysUserVo> queryPage(Page page, SysUserParam param) {
         Page<SysUserVo> userPage = baseMapper.queryPage(page, param);
         List<SysUserVo> userList = userPage.getRecords();
         if (!userList.isEmpty()) {
-            List<String> userIdList = userList.stream().map(user -> user.getId()).collect(Collectors.toList());
+            List<String> userIdList = userList.stream().map(user -> user.getUserInfoId()).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));
+            List<SysUserRole> roleIds  = sysRoleMapper.queryByUserIds(userIdList);
+            Map<String,List<SysUserRole>> nameMap = roleIds.stream()
+                    .collect(Collectors.groupingBy(SysUserRole::getUserId));
             userList.forEach(sysUser -> {
-                if(nameMap.containsKey(sysUser.getId())){
-                    sysUser.setRoleNames(nameMap.get(sysUser.getId()));
+                if(nameMap.containsKey(sysUser.getUserInfoId())){
+                    sysUser.setRoleNameList(nameMap.get(sysUser.getUserInfoId()).stream()
+                            .map(SysUserRole::getName).collect(Collectors.toList()));
                 }
             });
         }
@@ -74,43 +69,76 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         SysUser user = this.baseMapper.selectById(id);
         SysUserVo vo = new SysUserVo();
         BeanUtils.copyProperties(user, vo);
+        List<SysUserPlateInfo> infos = sysUserPlateInfoMapper.selectList(new LambdaQueryWrapper<SysUserPlateInfo>()
+                .eq(SysUserPlateInfo::getUserId, id)
+                .eq(SysUserPlateInfo::getSystemCode, SystemConstants.SYSTEM_PLATFORM.getCode()));
+        if(CollUtil.isNotEmpty(infos)){
+            vo.setIsEnable(infos.get(0).getIsEnable());
+        }
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(infos.get(0).getId());
+        // 批量查询 角色信息
+        List<SysUserRole> roleIds  = sysRoleMapper.queryByUserIds(userIdList);
+        Map<String,List<SysUserRole>> nameMap = roleIds.stream()
+                .collect(Collectors.groupingBy(SysUserRole::getUserId));
+        vo.setRoleNameList(nameMap.get(infos.get(0).getId()).stream()
+                .map(SysUserRole::getName).collect(Collectors.toList()));
         return vo;
     }
 
     @Override
     public boolean isExistsMobile(String mobile, String id) {
-        long count = this.count(new LambdaQueryWrapper<SysUser>()
+        List<SysUser> userList = this.list(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getMobile, mobile)
-                .ne(StringUtils.isNotNull(id),SysUser::getId, id)
-        );
-        return count > 0;
+                .ne(StringUtils.isNotNull(id),SysUser::getId, id));
+        if(CollUtil.isNotEmpty(userList)){
+            if(userList.size() > 1){
+                return true;
+            }
+            SysUser user = userList.get(0);
+            LambdaQueryWrapper<SysUserPlateInfo> infoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            infoLambdaQueryWrapper.eq(SysUserPlateInfo::getUserId, user.getId());
+            List<SysUserPlateInfo> infoList = sysUserPlateInfoMapper.selectList(infoLambdaQueryWrapper);
+            if(CollUtil.isNotEmpty(infoList)){
+                List<SysUserPlateInfo> jzgInfos = infoList.stream().filter(info ->
+                        "PLATFORM".equals(info.getSystemCode())).collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(jzgInfos)){
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void userAdd(SysUserAddParam param) {
+        List<SysUser> userList = this.list(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getMobile, param.getMobile())
+                .eq(SysUser::getAccountStatus, YesNoEnum.NO.getCode()));
         SysUser user = new SysUser();
-        BeanUtils.copyProperties(param, user);
-        user.setAccountStatus(1);
-        String salt = PasswordUtils.getSalt();
-        String encryptedPassword = PasswordUtils.encode("12345678",salt);
-        user.setSalt(salt);
-        user.setPassword(encryptedPassword);
-        this.save(user);
-        SysUserJzgInfo info = new SysUserJzgInfo();
-        info.setUserId(user.getId());
-        info.setSystemCode("PLATFORM");
-        info.setStatus(6);
-        sysUserJzgInfoMapper.insert(info);
+        if(CollUtil.isEmpty(userList)){
+            BeanUtils.copyProperties(param, user);
+            user.setAccountStatus(1);
+            String salt = PasswordUtils.getSalt();
+            String encryptedPassword = PasswordUtils.encode("12345678",salt);
+            user.setSalt(salt);
+            user.setPassword(encryptedPassword);
+            this.save(user);
+        }else{
+            user = userList.get(0);
+        }
+        SysUserPlateInfo info = new SysUserPlateInfo(user.getId());
+        sysUserPlateInfoMapper.insert(info);
         // 角色信息关联
         List<String> roleIdList = param.getRoleIdList();
         List<SysUserRole> userRoles = new ArrayList<>();
-        roleIdList.forEach(id -> {
+        for (String id : roleIdList) {
             SysUserRole sysUserRole = new SysUserRole();
-            sysUserRole.setUserId(user.getId());
+            sysUserRole.setUserId(info.getId());
             sysUserRole.setRoleId(id);
             userRoles.add(sysUserRole);
-        });
+        }
         sysUserRoleMapper.insert(userRoles);
     }
 
@@ -121,9 +149,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         BeanUtils.copyProperties(param, user);
         this.updateById(user);
 
+        SysUserPlateInfo info = sysUserPlateInfoMapper.selectOne(new LambdaQueryWrapper<SysUserPlateInfo>()
+                .eq(SysUserPlateInfo::getUserId, user.getId()));
+
         // 删除当前用户与角色的关联信息
         LambdaUpdateWrapper<SysUserRole> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(SysUserRole::getUserId, user.getId());
+        updateWrapper.eq(SysUserRole::getUserId, info.getId());
         sysUserRoleMapper.delete(updateWrapper);
 
         // 角色信息关联
@@ -131,7 +162,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         List<SysUserRole> userRoles = new ArrayList<>();
         roleList.forEach(id -> {
             SysUserRole sysUserRole = new SysUserRole();
-            sysUserRole.setUserId(user.getId());
+            sysUserRole.setUserId(info.getId());
             sysUserRole.setRoleId(id);
             userRoles.add(sysUserRole);
         });
@@ -145,23 +176,30 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         LambdaUpdateWrapper<SysUserRole> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.in(SysUserRole::getUserId, ids);
         sysUserRoleMapper.delete(updateWrapper);
+        sysUserPlateInfoMapper.delete(new LambdaQueryWrapper<SysUserPlateInfo>().in(SysUserPlateInfo::getUserId, ids));
         return baseMapper.deleteByIds(ids) > 0;
     }
 
     @Override
     public void unDeploy(String id) {
-        SysUser user = new SysUser();
-        user.setId(id);
-        user.setAccountStatus(YesNoEnum.NO.getCode());
-        baseMapper.updateById(user);
+        LambdaQueryWrapper<SysUserPlateInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUserPlateInfo::getUserId, id);
+        List<SysUserPlateInfo> infos = sysUserPlateInfoMapper.selectList(wrapper);
+        infos.forEach(info -> {
+            info.setIsEnable(0);
+        });
+        sysUserPlateInfoMapper.updateById(infos);
     }
 
     @Override
     public void reDeploy(String id) {
-        SysUser user = new SysUser();
-        user.setId(id);
-        user.setAccountStatus(YesNoEnum.YES.getCode());
-        baseMapper.updateById(user);
+        LambdaQueryWrapper<SysUserPlateInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUserPlateInfo::getUserId, id);
+        List<SysUserPlateInfo> infos = sysUserPlateInfoMapper.selectList(wrapper);
+        infos.forEach(info -> {
+            info.setIsEnable(1);
+        });
+        sysUserPlateInfoMapper.updateById(infos);
     }
 
     @Override
@@ -185,7 +223,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
                     .in(SysUserRole::getUserId, ids));
             if(CollUtil.isNotEmpty(userRoles)){
                 for (SysUserRole userRole : userRoles) {
-                    if ("".equals(userRole.getRoleId())){  // 平台管理员id
+                    if ("1".equals(userRole.getRoleId())){  // 平台管理员id
                         return false;
                     }
                 }

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

@@ -34,12 +34,13 @@
                 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.commons.entity.po.SysRole">
+
+    <select id="queryByUserIds" resultType="com.jzg.commons.entity.po.SysUserRole">
         SELECT
-            sur.user_id, sr.`name`
+        sur.role_id, sur.user_id,sr.name
         FROM
-            sys_user_role sur
-                LEFT JOIN sys_role sr ON sur.role_id = sr.id
+        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

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

@@ -29,19 +29,18 @@
         SELECT sr.id,sr.username,sr.password,
         sr.salt,sr.mobile,sr.account_status,
         sr.create_by,sr.create_time,sr.update_by,
-        sr.update_time,sr.is_delete
+        sr.update_time,sr.is_delete,si.is_enable as isEnable,si.id as userInfoId
         FROM sys_user sr
-        LEFT JOIN sys_user_jzg_info si on sr.id = si.user_id
+        LEFT JOIN sys_user_plate_info si on sr.id = si.user_id
         <where>
-            <if test="param.accountStatus != null and param.accountStatus != ''">
-                and sr.account_status = #{param.accountStatus}
+            <if test="param.isEnable != null">
+                and si.is_enable = #{param.isEnable}
             </if>
             <if test="param.searchValue != null and param.searchValue != ''">
                 and ( sr.username = #{param.searchValue} or sr.mobile = #{param.searchValue} or sr.id = #{param.searchValue})
             </if>
             and si.system_code = 'PLATFORM' and sr.is_delete = 0
         </where>
-        GROUP BY sr.id
         ORDER BY create_time DESC
     </select>
 </mapper>

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

@@ -0,0 +1,24 @@
+<?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.SysUserPlateInfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysUserPlateInfo">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+            <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
+            <result property="isEnable" column="is_enable" jdbcType="TINYINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,system_code,
+        is_enable,create_time,create_by,
+        update_time,update_by,is_delete
+    </sql>
+</mapper>

tenant/organization/src/main/java/com/jzg/organization/controller/DeptController.java

@@ -3,6 +3,7 @@ package com.jzg.organization.controller;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysArea;
+import com.jzg.commons.entity.dto.SysDeptParam;
 import com.jzg.commons.entity.po.SysDept;
 import com.jzg.commons.entity.vo.SysAreaVo;
 import com.jzg.commons.entity.vo.SysDeptVo;
@@ -61,12 +62,12 @@ public class DeptController extends BaseController {
 
     @Operation(summary = "机构树形查询")
     @PostMapping(value = "/getDeptTree")
-    public HttpResult<List<SysDeptVo>> getDeptTree(String sysCode){
+    public HttpResult<List<SysDeptVo>> getDeptTree(@RequestBody SysDeptParam param){
         String deptId = "";
-        if(StringUtils.isEmpty(sysCode)){
+        if(StringUtils.isEmpty(param.getSysCode())){
             deptId = getUserDeptId();
         }
-        List<SysDeptVo> deptTree = sysDeptService.getDeptTree(deptId,sysCode);
+        List<SysDeptVo> deptTree = sysDeptService.getDeptTree(deptId,param);
         return HttpResult.ok(deptTree);
     }
 }

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

@@ -2,6 +2,7 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysDeptParam;
 import com.jzg.commons.entity.po.SysDept;
 import com.jzg.commons.entity.vo.SysDeptVo;
 
@@ -37,7 +38,7 @@ public interface SysDeptService extends IService<SysDept> {
     /**
      * 机构树
      */
-    List<SysDeptVo> getDeptTree(String deptId, String sysCode);
+    List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param);
 
 
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysArea;
+import com.jzg.commons.entity.dto.SysDeptParam;
 import com.jzg.commons.entity.po.SysDept;
 import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.vo.SysUserVo;
@@ -160,7 +161,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     @Override
-    public List<SysDeptVo> getDeptTree(String deptId, String sysCode) {
+    public List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param) {
+        String sysCode = param.getSysCode();
         String userSystemCode = null;
         if (StringUtils.isEmpty(sysCode)){
             userSystemCode = baseController.getUserSystemCode();
@@ -208,8 +210,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         SysDeptVo baseDept = new SysDeptVo(sysDept);
         baseDept.setId("0");
         baseDept.setName(bySysCode.getSysName());
-        baseDept.setChildren(voDept);
+        baseDept.setChildren(sysDepts);
         newResultDept.add(baseDept);
         return newResultDept;
     }
+
 }