From 084379b8a47cd1daf545970311b833aeb60c34f0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Jun 2020 14:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=9A=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9EmyagencyName,agenc?=
 =?UTF-8?q?yId,=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3getLatestCustomer?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9EagencyName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/LatestCustomerResultDTO.java  |  8 +++++++-
 .../main/java/com/epmet/dto/result/MineResultDTO.java  | 10 ++++++++++
 .../service/impl/CustomerStaffAgencyServiceImpl.java   |  5 +++++
 .../java/com/epmet/service/impl/StaffServiceImpl.java  |  9 +++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java
index 8a5249c6ae..3c96aa6df6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java
@@ -21,9 +21,15 @@ public class LatestCustomerResultDTO implements Serializable {
 	 */
 	private String customerName;
 	/**
-	 * 用户所属组织id（任意一条）
+	 * 用户所属组织id
 	 */
 	private String agencyId;
+
+	/**
+	 * 用户所属组织名称
+	 */
+	private String agencyName;
+
 	/**
 	 * 工作人员头像
 	 */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
index f19eb67cea..241f2eb44f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
@@ -40,4 +40,14 @@ public class MineResultDTO implements Serializable {
 	 * 角色
 	 */
 	private List<String> roleList;
+
+	/**
+	 * 我所属的机关id
+	 */
+	private String agencyId;
+
+	/**
+	 * 我所属的机关名称
+	 */
+	private String myAgencyName;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
index 17f9f75731..ba90138f12 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
@@ -131,6 +131,11 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         CustomerStaffAgencyDTO customerStaffAgencyDTO = baseDao.selectLatestCustomerByStaff(userId);
 
         resultDTO.setAgencyId(customerStaffAgencyDTO.getAgencyId());
+        CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerStaffAgencyDTO.getAgencyId());
+        if(null!=customerAgencyDTO){
+            //用户所属机关名称
+            resultDTO.setAgencyName(customerAgencyDTO.getOrganizationName());
+        }
         resultDTO.setCustomerId(customerStaffAgencyDTO.getCustomerId());
         //获取工作人员头像
         CustomerStaffDTO customerStaffParam = new CustomerStaffDTO();
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 32ec8df9ab..065b6a71d0 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
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
@@ -171,7 +172,15 @@ public class StaffServiceImpl implements StaffService {
 		result.setStaffHeadPhoto(staffDetail.getHeadPhoto());
 		result.setGender(staffDetail.getGender());
 		result.setRoleList(staffDetail.getRoles());
+		//用户所属机关名称（上级-本级）
 		result.setAgencyName(agencyName);
+		//新增返参： 用户所属机关id
+		result.setAgencyId(customerStaffAgency.getAgencyId());
+		CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerStaffAgency.getAgencyId());
+		if(null!=customerAgencyDTO){
+			//用户所属机关名称
+			result.setAgencyName(customerAgencyDTO.getOrganizationName());
+		}
 		return result;
 	}
 }