From 4850edbbf4a32dc00fce967f54eccc4eb1a3ab8b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 25 Jul 2022 17:09:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=92=8C=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/StaffSubmitAccountFromDTO.java    | 4 ++++
 .../main/java/com/epmet/dto/result/StaffInitResultDTO.java    | 4 ++++
 .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitAccountFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitAccountFromDTO.java
index 48b015614a..7e0bf7e36c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitAccountFromDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitAccountFromDTO.java
@@ -75,4 +75,8 @@ public class StaffSubmitAccountFromDTO implements Serializable {
 	 * 来源client(PC端:web、微信小程序:wxmp)
 	 */
 	private String client;
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java
index 3efc2d6342..9cb3a68c0a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java
@@ -37,6 +37,10 @@ public class StaffInitResultDTO implements Serializable {
 	 * 专兼职
 	 */
 	private String workType;
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
 	/**
 	 * 职责列表
 	 */
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 561703a793..3ab515d58e 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
@@ -287,6 +287,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         resultDTO.setGender(customerStaffDTO.getGender());
         resultDTO.setMobile(customerStaffDTO.getMobile());
         resultDTO.setWorkType(customerStaffDTO.getWorkType());
+        resultDTO.setIdCard(customerStaffDTO.getIdCard());
         //获取角色列表
         GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
         govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
@@ -407,6 +408,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         staffEntity.setWorkType(fromDTO.getWorkType());
         staffEntity.setEnableFlag(CustomerStaffConstant.ENABLE);
         staffEntity.setPassword(PasswordUtils.encode(fromDTO.getPwd()));
+        staffEntity.setIdCard(fromDTO.getIdCard());
         baseDao.insert(staffEntity);
 
         //工作人员角色关联表
@@ -538,6 +540,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         if (StringUtils.isNotBlank(fromDTO.getPwd())){
             staffEntity.setPassword(PasswordUtils.encode(fromDTO.getPwd()));
         }
+        staffEntity.setIdCard(fromDTO.getIdCard());
         baseDao.updateById(staffEntity);
 
         //清空权限关联

From 0cceb20fd4ff4086ef65362df00a1d11db664601 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 25 Jul 2022 17:16:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E6=8E=89=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/StaffServiceImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index f589bfb0b7..f1770a36a5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -199,10 +199,9 @@ public class StaffServiceImpl implements StaffService {
 	public Result editStaffByAccount(TokenDto tokenDto, StaffSubmitAccountFromDTO fromDTO) {
 		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
-
 		fromDTO.setApp(tokenDto.getApp());
 		fromDTO.setClient(tokenDto.getClient());
-		logger.info("获取到的参数为:"+fromDTO.toString());
+
 		Result result = epmetUserFeignClient.editStaffByAccount(fromDTO);
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {