From d14740474c7b7261893fa5fe479136fca1457eee Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 18 Oct 2024 17:11:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/web/controller/system/SysUserController.java         | 4 ++--
 .../src/main/resources/mapper/system/SysUserMapper.xml       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/system/SysUserController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/system/SysUserController.java
index 9b4a87e..0dc57c7 100644
--- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/system/SysUserController.java
+++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/system/SysUserController.java
@@ -56,7 +56,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    // @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {
@@ -247,7 +247,7 @@ public class SysUserController extends BaseController
     /**
      * 获取部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    // @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {
diff --git a/pms-system/src/main/resources/mapper/system/SysUserMapper.xml b/pms-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0c30301..9685fb0 100644
--- a/pms-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/pms-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="SysUser" id="SysUserResult">
         <id     property="userId"       column="user_id"      />
         <result property="deptId"       column="dept_id"      />
+        <result property="tenantId"       column="tenant_id"      />
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
         <result property="email"        column="email"        />
@@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
-        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
+        <collection  property="roles"  column="user_id"  select="tech.unissense.pms.system.mapper.SysRoleMapper.selectRolePermissionByUserId"  />
     </resultMap>
 	
     <resultMap id="deptResult" type="SysDept">
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id,u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u