From 1f06f412a50cb68d8b1af6abbd67cc818d422d24 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 18 Jan 2024 11:05:12 +0800
Subject: [PATCH] 2024.1.18

---
 .../sys/modules/pms/data/EamAdminData.java    | 24 +++++++++++++++++++
 src/main/resources/mapper/pms/EamMapper.xml   | 13 +++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
index 24b533fa..945b5bae 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
@@ -47,6 +47,14 @@ public class EamAdminData extends QueryPage {
      * bu名称
      */
     private String buDesc;
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+    /**
+     * 角色名称
+     */
+    private String roleName;
 
     public String getBu() {
         return bu;
@@ -132,6 +140,22 @@ public class EamAdminData extends QueryPage {
         return site;
     }
 
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     public void setSite(String site) {
         this.site = site;
     }
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 8342318d..5f718123 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1503,10 +1503,15 @@
             a.username as adminID,
             a.email,
             a.mobile as phone,
-            a.user_display as adminName
+            a.user_display as adminName,
+            dbo.get_bu_desc(c.site,c.bu_no) as buDesc,
+            d.role_id,
+            e.role_name
         FROM sys_user as a
         LEFT JOIN eam_access_site as b on a.username = b.username
         LEFT JOIN AccessBu as c on b.username = c.username and b.site = c.site
+        LEFT JOIN sys_user_role as d on a.user_id = d.user_id
+        LEFT JOIN sys_role as e on d.role_id = e.role_id
         <where>
             b.site = #{site} and c.bu_no = #{buNo}
             <if test = "adminID != null and adminID != ''">
@@ -1515,6 +1520,12 @@
             <if test = "adminName != null and adminName != ''">
                 AND a.user_display LIKE '%' + #{adminName}+'%'
             </if>
+            <if test = "buDesc != null and buDesc != ''">
+                AND dbo.get_bu_desc(a.site,c.bu_no) LIKE '%' + #{buDesc}+'%'
+            </if>
+            <if test = "roleName != null and roleName != ''">
+                AND e.role_name LIKE '%' + #{roleName}+'%'
+            </if>
         </where>
     </select>