From d23f55b08779959e0ffbe9068a5296f8c1c13357 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 1 Jul 2021 09:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java   | 2 ++
 .../src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java  | 2 ++
 .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java
index 81498e5586..b26db57327 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java
@@ -31,4 +31,6 @@ public class RoleInfoResultDTO implements Serializable{
     private Boolean fullTimeOnly = false;
 
     private String roleKey;
+
+    private String description;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java
index 9d596bca43..b39085d40c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java
@@ -30,4 +30,6 @@ public class StaffRoleResultDTO implements Serializable {
 	 */
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private Boolean selected;
+
+	private String description;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index aea728c458..b2a7d02d32 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -245,6 +245,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 					staffRoleResultDTO.setRoleId(p.getId());
 					staffRoleResultDTO.setRoleName(p.getRoleName());
 					staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					staffRoleResultDTO.setDescription(p.getDescription());
 					return staffRoleResultDTO;
 				}).collect(Collectors.toList());
 		return new Result<List<RoleInfoResultDTO>>().ok(staffRoleList);
@@ -277,6 +278,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 					staffRoleResultDTO.setRoleId(p.getId());
 					staffRoleResultDTO.setRoleName(p.getRoleName());
 					staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					staffRoleResultDTO.setDescription(p.getDescription());
 					staffRoleResultDTO.setSelected(false);
 					return staffRoleResultDTO;
 				}).collect(Collectors.toList());