Merge branch 'dev_bugfix_ljj' into develop

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
 	 */

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
 	 */

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);
+		return 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

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",