灵山项目：增加返回管理员角色：ROLE_KEY

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffsByOrgAndRoleRstDTO.java

@@ -68,4 +68,6 @@ public class StaffsByOrgAndRoleRstDTO {
     private Integer mediator;
 
     private String political;
+
+    private String roleType;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -219,6 +219,7 @@
             resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffsByOrgAndRoleRstDTO">
         SELECT
             sr.STAFF_ID,
+            sr.ROLE_KEY AS roleType,
             cs.REAL_NAME AS staffName,
             cs.MOBILE,
             cs.GENDER,
@@ -232,7 +233,7 @@
             cs.MEDIATOR,
             cs.POLITICAL
         FROM (
-                SELECT DISTINCT srr.STAFF_ID
+                SELECT DISTINCT srr.STAFF_ID,gsr.ROLE_KEY
                 FROM staff_role srr
                 INNER JOIN gov_staff_role gsr ON (srr.ROLE_ID = gsr.ID)
                    <where>