Merge branch 'feature/py_loginaccount' into pingyin_master

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;
 }

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;
 	/**
 	 * 职责列表
 	 */

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()) {

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);
 
         //清空权限关联