From 52c220ec258363e2ef0166d8ff47f3c3aa79de3b Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 15 Jan 2021 17:39:33 +0800
Subject: [PATCH] =?UTF-8?q?EPMET=5FUSER=E5=BA=93=E4=B8=AD=EF=BC=8Cuser?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81staff=5Frole=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E3=80=90=E5=AE=A2=E6=88=B7Id=E3=80=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/StaffRoleDTO.java            | 2 ++
 .../src/main/java/com/epmet/dto/UserDTO.java                 | 1 +
 .../src/main/java/com/epmet/entity/StaffRoleEntity.java      | 4 ++++
 .../src/main/java/com/epmet/entity/UserEntity.java           | 5 ++++-
 .../src/main/java/com/epmet/entity/UserWechatEntity.java     | 2 +-
 .../com/epmet/service/impl/CustomerStaffServiceImpl.java     | 2 ++
 .../main/java/com/epmet/service/impl/UserServiceImpl.java    | 1 +
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
index 59d649f970..53d3b7e868 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
@@ -83,4 +83,6 @@ public class StaffRoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
+
+	private String customerId;
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java
index ab7f652268..7509214f74 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java
@@ -63,4 +63,5 @@ public class UserDTO implements Serializable{
      */
     private Date updatedTime;
 
+    private String customerId;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
index 20f828a52d..1d330d8d5b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
@@ -53,4 +53,8 @@ public class StaffRoleEntity extends BaseEpmetEntity {
      */
 	private String orgId;
 
+	/**
+	 * 客户Id
+	 */
+	private String customerId;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java
index 47c11d3a60..8993da30e7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java
@@ -29,6 +29,9 @@ public class UserEntity extends BaseEpmetEntity {
      * */
     private String fromClient;
 
-
+    /**
+     * 客户Id
+     */
+    private String customerId;
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java
index 218d7a879d..5132184b49 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java
@@ -74,5 +74,5 @@ public class UserWechatEntity extends BaseEpmetEntity {
      */
     private String language;
 
-
+    private String customerId;
 }
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 e592642c97..13d5067e52 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
@@ -303,6 +303,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		UserEntity userEntity = new UserEntity();
 		userEntity.setFromApp(fromDTO.getApp());
 		userEntity.setFromClient(fromDTO.getClient());
+		userEntity.setCustomerId(fromDTO.getCustomerId());
 		userService.insert(userEntity);
 		//Customer_Staff表插入数据
 		CustomerStaffEntity staffEntity = new CustomerStaffEntity();
@@ -322,6 +323,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 			staffRoleEntity.setStaffId(userEntity.getId());
 			staffRoleEntity.setRoleId(role);
 			staffRoleEntity.setOrgId(fromDTO.getAgencyId());
+			staffRoleEntity.setCustomerId(fromDTO.getCustomerId());
 			staffRoleService.insert(staffRoleEntity);
 		});
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 103a7a16c0..1c1126e131 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -91,6 +91,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             UserEntity userEntity = new UserEntity();
             userEntity.setFromApp(UserConstant.APP_RESI);
             userEntity.setFromClient(UserConstant.CLIENT_WX);
+            userEntity.setCustomerId(userWechatDTO.getCustomerId());
             baseDao.insert(userEntity);
             userWechatEntity.setUserId(userEntity.getId());
             userWechatDao.insert(userWechatEntity);