From 1d58c4e52bfdc92558e3b44ac9178e404f172812 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 24 Feb 2022 11:17:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AEstaffId=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AE=A2=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/BasicInfoResultDTO.java   |  3 ++-
 .../service/impl/CustomerStaffServiceImpl.java     | 14 +++++++++++++-
 .../src/main/resources/mapper/CustomerStaffDao.xml |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
index 2877fc47ed..5fff4bc298 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -13,6 +12,8 @@ import java.io.Serializable;
 public class BasicInfoResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 8987281818368677411L;
+	private String customerId;
+	private String customerName;
 	/**
 	 * 工作人员id
 	 */
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 418b9dfbc6..4bf02513b6 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
@@ -765,7 +765,19 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	 */
 	@Override
 	public BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
-		return baseDao.getStaffBasicInfo(fromDTO);
+		BasicInfoResultDTO result = baseDao.getStaffBasicInfo(fromDTO);
+		//获取工作人员所属客户名
+		CustomerDTO dto = new CustomerDTO();
+		dto.setId(result.getCustomerId());
+		Result<CustomerDTO> customerResult = operCrmOpenFeignClient.getCustomerInfo(dto);
+		if (!customerResult.success()) {
+			throw new RenException(customerResult.getCode(), customerResult.getMsg());
+		}
+		if (null != customerResult.getData()) {
+			result.setCustomerName(customerResult.getData().getCustomerName());
+		}
+		
+		return result;
 	}
 
 	@Override
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index f441f419af..1448824323 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -341,6 +341,7 @@
 
     <select id="getStaffBasicInfo" resultType="com.epmet.dto.result.BasicInfoResultDTO">
         SELECT
+            CUSTOMER_ID,
             user_id AS "staffId",
             real_name AS "realName",
             mobile AS "mobile",

From c91dc6307216283aaddb03a1e0b52eec0859c021 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 24 Feb 2022 11:55:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AEstaffId=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AE=A2=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/BasicInfoResultDTO.java  |  2 --
 .../dto/result/StaffBasicInfoResultDTO.java   |  2 +-
 .../impl/CustomerStaffServiceImpl.java        | 24 +++++++++----------
 .../resources/mapper/CustomerStaffDao.xml     |  1 -
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
index 5fff4bc298..e57abaf6a4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
@@ -12,8 +12,6 @@ import java.io.Serializable;
 public class BasicInfoResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 8987281818368677411L;
-	private String customerId;
-	private String customerName;
 	/**
 	 * 工作人员id
 	 */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
index f981a68f8b..52c432f810 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
@@ -16,7 +16,7 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 * 客户Id
 	 */
 	private String customerId;
-
+	private String customerName;
 	/**
 	 * 用户Id
 	 */
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 4bf02513b6..7f814d3ac8 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
@@ -742,6 +742,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 				resultDTO.setLongitude(staffInfo.getLongitude());
 				resultDTO.setLatitude(staffInfo.getLatitude());
 			}
+			//获取工作人员所属客户名
+			CustomerDTO dto = new CustomerDTO();
+			dto.setId(customerId);
+			Result<CustomerDTO> customerResult = operCrmOpenFeignClient.getCustomerInfo(dto);
+			if (!customerResult.success()) {
+				throw new RenException(customerResult.getCode(), customerResult.getMsg());
+			}
+			if (null != customerResult.getData()) {
+				resultDTO.setCustomerName(customerResult.getData().getCustomerName());
+			}
 		}
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }
@@ -765,19 +775,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	 */
 	@Override
 	public BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
-		BasicInfoResultDTO result = baseDao.getStaffBasicInfo(fromDTO);
-		//获取工作人员所属客户名
-		CustomerDTO dto = new CustomerDTO();
-		dto.setId(result.getCustomerId());
-		Result<CustomerDTO> customerResult = operCrmOpenFeignClient.getCustomerInfo(dto);
-		if (!customerResult.success()) {
-			throw new RenException(customerResult.getCode(), customerResult.getMsg());
-		}
-		if (null != customerResult.getData()) {
-			result.setCustomerName(customerResult.getData().getCustomerName());
-		}
-		
-		return result;
+		return baseDao.getStaffBasicInfo(fromDTO);
 	}
 
 	@Override
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 1448824323..f441f419af 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -341,7 +341,6 @@
 
     <select id="getStaffBasicInfo" resultType="com.epmet.dto.result.BasicInfoResultDTO">
         SELECT
-            CUSTOMER_ID,
             user_id AS "staffId",
             real_name AS "realName",
             mobile AS "mobile",