Merge remote-tracking branch 'origin/dev_heart' into dev_heart

epmet-auth/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.56
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.57
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-test
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.24
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.65
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.72
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.32
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.33
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.76
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.77
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.59
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.62
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.24
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.30
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.84
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.85
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.81
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.84
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.84</version>
+    <version>0.3.85</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -222,13 +222,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		if (null == roleList || roleList.size() == 0) {
 			return new Result<List<RoleInfoResultDTO>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
-		List<RoleInfoResultDTO> staffRoleList = roleList.stream().map(p -> {
+		List<RoleInfoResultDTO> staffRoleList = roleList.stream()
-			RoleInfoResultDTO staffRoleResultDTO = new RoleInfoResultDTO();
+				.filter(p -> !RoleKeyConstants.ROLE_KEY_ROOT_MANAGER.equals(p.getRoleKey()))
-			staffRoleResultDTO.setRoleId(p.getId());
+				.map(p -> {
-			staffRoleResultDTO.setRoleName(p.getRoleName());
+					RoleInfoResultDTO staffRoleResultDTO = new RoleInfoResultDTO();
-			staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					staffRoleResultDTO.setRoleId(p.getId());
-			return staffRoleResultDTO;
+					staffRoleResultDTO.setRoleName(p.getRoleName());
-		}).collect(Collectors.toList());
+					staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					return staffRoleResultDTO;
+				}).collect(Collectors.toList());
 		return new Result<List<RoleInfoResultDTO>>().ok(staffRoleList);
 	}