From 1703c96b6833244340dc10bf746d8c08a331008c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 三月 2021 11:22:18 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 4 ++++
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 3 ++-
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
index 2b5d425..70071d3 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
@@ -179,4 +179,6 @@
@TableField(exist = false)
private String deptIds;
+ @TableField(exist = false)
+ private String allDeptName;
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index eefeaa1..5dfddf3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -429,4 +429,8 @@
@ExcelField(value = "护卫点(部门)")
@TableField("allDeptName")
private String allDeptName = "";
+
+ // @FieldInfo(name = "dimissRemark", type = "varchar", explain = "离职备注")
+ // @TableField("dimissRemark")
+ // private String dimissRemark = "";
}
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
index d512c96..6331868 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -19,7 +19,8 @@
u.avatar,
d.dept_name deptName,
GROUP_CONCAT(r.role_id) roleId,
- GROUP_CONCAT(r.role_name) roleName
+ GROUP_CONCAT(r.role_name) roleName,
+ d.allDeptName
FROM
t_user u
LEFT JOIN t_dept d ON (u.dept_id = d.dept_id)
--
Gitblit v1.8.0