site描述

src/main/java/com/xujie/sys/modules/factory/entity/vo/BusinessRoleVo.java

@@ -13,6 +13,10 @@ import java.util.List;
 public class BusinessRoleVo extends BusinessRole {
 
     private String site;
+    /**
+     * 工厂描述
+     */
+    private String sitename;
 
     /**
      * site + bu
@@ -44,6 +48,14 @@ public class BusinessRoleVo extends BusinessRole {
         this.site = site;
     }
 
+    public String getSitename() {
+        return sitename;
+    }
+
+    public void setSitename(String sitename) {
+        this.sitename = sitename;
+    }
+
     public String getBu() {
         return bu;
     }

src/main/resources/mapper/factory/SiteMapper.xml

@@ -235,25 +235,38 @@
     <select id="getBusinessRoleList1" resultType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo">
         SELECT
             a.site,
+            c.sitename,
             a.role_no,
             a.role_desc
         FROM business_role a
         left join access_role b on a.site=b.site and a.role_no = b.role_no and b.username = #{username}
+        left join site c on a.site = c.siteid
         WHERE a.site in (select site from eam_access_site where username = #{username})
         and b.username is null
-          <if test = "site != null and site != ''">
+        <if test = "site != null and site != ''">
             AND a.site = #{site}
         </if>
+        <if test = "sitename != null and sitename != ''">
+            AND c.sitename LIKE '%' + #{sitename} + '%'
+        </if>
+        <if test = "roleNo != null and roleNo != ''">
+            AND a.role_no LIKE '%' + #{roleNo} + '%'
+        </if>
+        <if test = "roleDesc != null and roleDesc != ''">
+            AND a.role_desc LIKE '%' + #{roleDesc} + '%'
+        </if>
     </select>
 
     <!-- 获取当前用户包含的角色 -->
     <select id="getBusinessRoleList2" resultType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo">
         SELECT
             b.site,
+            c.sitename,
             b.role_no,
             b.role_desc
         FROM access_role a
         LEFT JOIN business_role b ON a.site = b.site and a.role_no = b.role_no
+        LEFT JOIN site c ON a.site = c.siteid
         WHERE a.username = #{username}
     </select>
     <select id="selectBusinessRoleByUserName"