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 @@
3.6.3
- 3.6.8
+ 3.6.9
base-system-common
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 @@
com.health
base-system-common
- 3.6.8
+ 3.6.9
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 @@
com.health
base-system-common
- 3.6.8
+ 3.6.9
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"
+
+
+
+
+
+
+
@@ -58,6 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_role r on r.role_id = ur.role_id
+
+ 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
+
+