From 4cb15f03e553e2527d0bf5f3afddf187d00b9742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com>
Date: Thu, 2 Nov 2023 22:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=20system-common=20=E4=B8=BA3?=
 =?UTF-8?q?.6.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base-system-common/pom.xml                        |  2 +-
 .../com/health/system/common/domain/SysUser.java  |  5 +++++
 base-system-remote/pom.xml                        |  2 +-
 base-system-server/pom.xml                        |  2 +-
 .../resources/mapper/system/SysUserMapper.xml     | 15 ++++++++++++++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/base-system-common/pom.xml b/base-system-common/pom.xml
index 4eefa25..07ea09c 100644
--- a/base-system-common/pom.xml
+++ b/base-system-common/pom.xml
@@ -9,7 +9,7 @@
         <version>3.6.3</version>
     </parent>
     <!--重构登录注册模块后 重构系统公共实体类-->
-    <version>3.6.8</version>
+    <version>3.6.9</version>
     <artifactId>base-system-common</artifactId>
 
     <properties>
diff --git a/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java b/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java
index 886f0f2..de901d0 100644
--- a/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java
+++ b/base-system-common/src/main/java/com/health/system/common/domain/SysUser.java
@@ -112,6 +112,11 @@ public class SysUser extends BaseEntity {
     })
     private SysDept dept;
 
+    /*
+    部门实体类
+     */
+    private Department department;
+
     /**
      * 角色对象
      */
diff --git a/base-system-remote/pom.xml b/base-system-remote/pom.xml
index 4d6614d..a9dccb7 100644
--- a/base-system-remote/pom.xml
+++ b/base-system-remote/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.health</groupId>
             <artifactId>base-system-common</artifactId>
-            <version>3.6.8</version>
+            <version>3.6.9</version>
         </dependency>
 
     </dependencies>
diff --git a/base-system-server/pom.xml b/base-system-server/pom.xml
index 0660f1c..f5e50b8 100644
--- a/base-system-server/pom.xml
+++ b/base-system-server/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.health</groupId>
             <artifactId>base-system-common</artifactId>
-            <version>3.6.8</version>
+            <version>3.6.9</version>
         </dependency>
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
diff --git a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
index 68c2487..397da24 100644
--- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,10 +23,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<association property="department" javaType="com.health.system.common.domain.Department" resultMap="departmentResult"></association>
         <association property="dept"    javaType="com.health.system.common.domain.SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
 
+	<!--映射自定义部门bean对象的resultMao-->
+	<resultMap id="departmentResult" type="com.health.system.common.domain.Department">
+		<id column="id" property="departmentId"></id>
+		<result column="name" property="departmentName"></result>
+	</resultMap>
+
     <resultMap id="deptResult" type="com.health.system.common.domain.SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -58,6 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
 
+	<sql id="selectMySelfSysUser">
+		select  user_id,dept_id,user_name,nick_name,email,phonenumber,sex,avatar,password,status,del_flag,
+				login_ip,login_date,create_by,sys_user.create_time,sys_user.update_by,sys_user.update_time,remark,name
+		from sys_user left join  tb_moreover on sys_user.dept_id=tb_moreover.id
+	</sql>
+
     <select id="selectUserList" parameterType="com.health.system.common.domain.SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -156,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select * from tb_doctor where doctor_id=#{userId}
 	</select>
 	<select id="selectUserByUserEmail" resultType="com.health.system.common.domain.SysUser">
-		select * from sys_user where email=#{email}
+		<include refid="selectMySelfSysUser"/> where email=#{email}
 	</select>