From 6be7a5b8b5beefc0c643f887914f53010cb61d85 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 26 Aug 2020 17:35:00 +0800
Subject: [PATCH] =?UTF-8?q?EXT=20staffInfo=20=20=20=20staffPermission?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/CustomerAgencyDao.java |  9 ++++++-
 .../impl/CustomerAgencyServiceImpl.java       | 25 +++++++++----------
 .../resources/mapper/CustomerAgencyDao.xml    | 16 ++++++++++++
 .../epmet/feign/EpmetUserOpenFeignClient.java |  9 -------
 .../EpmetUserOpenFeignClientFallback.java     |  5 ----
 .../StaffAgencyVisitedController.java         | 12 ---------
 .../com/epmet/dao/StaffAgencyVisitedDao.java  |  1 -
 .../service/StaffAgencyVisitedService.java    |  8 ------
 .../impl/StaffAgencyVisitedServiceImpl.java   | 16 +-----------
 .../mapper/StaffAgencyVisitedDao.xml          | 16 +-----------
 10 files changed, 38 insertions(+), 79 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 26ec50ed8e..613f4d82bb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -133,7 +133,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @date 2020.08.17 09:50
     **/
     ExtStaffInfoResultDTO selectAgencyAndGridInfoExt(@Param("gridId") String gridId);
-
+    /**
+     * @Description 当没有工作人员最近访问的gridId时查询该用户所属的组织机关信息
+     * @param staffId
+     * @return
+     * @author wangc
+     * @date 2020.08.17 09:50
+     **/
+    ExtStaffInfoResultDTO selectAgencyInfoWhenGridIdIsNull(@Param("staffId")String staffId);
     /**
      * @Description 根据agencyId查找指定机构的信息，直属网格、部门
      * @param agencyId
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index c401f89afc..224a33571f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -848,8 +848,12 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     public ExtStaffInfoResultDTO staffInfoExt(ExtStaffInfoResultDTO result) {
 
         //1.查找对应的所属关系，通过最近一次登陆的网格，通过网格查找对应的机关和客户
-        ExtStaffInfoResultDTO orgInfo =
-            baseDao.selectAgencyAndGridInfoExt(result.getGridId());
+        ExtStaffInfoResultDTO orgInfo;
+        if(StringUtils.isNotBlank(result.getGridId())){
+            orgInfo = baseDao.selectAgencyAndGridInfoExt(result.getGridId());
+        }else{
+            orgInfo = baseDao.selectAgencyInfoWhenGridIdIsNull(result.getUserId());
+        }
         mergeObject(orgInfo,result);
         //2.查找客户名称
         CustomerDTO customerParam = new CustomerDTO();
@@ -881,22 +885,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     @Override
     public ExtStaffPermissionResultDTO staffPermissionExt(String staffId) {
 
-        //1.通过staffId去user服务查询最近一次登陆的agencyId
-        Result<String> agency =
-                epmetUserOpenFeignClient.latestAgency(staffId);
-        if(agency.success() && StringUtils.isNotBlank(agency.getData())){
-        //2.根据此agencyId查询数据权限
-            ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(agency.getData());
-            return res;
-        }else{
-            logger.error("com.epmet.service.impl.CustomerAgencyServiceImpl.staffPermissionExt，没有找到工作人员最近一次登陆的Agency信息，用户Id：{}",staffId);
+
+        CustomerStaffAgencyDTO agency = customerStaffAgencyDao.selectLatestCustomerByStaff(staffId);
+        if(null == agency || StringUtils.isBlank(agency.getAgencyId())){
+            logger.error("com.epmet.service.impl.CustomerAgencyServiceImpl.staffPermissionExt，没有找到工作人员所属的机关信息，用户Id：{}",staffId);
             ExtStaffPermissionResultDTO emptyResult = new ExtStaffPermissionResultDTO();
             checkFieldAndSetDefault(emptyResult);
             return emptyResult;
         }
 
-
-
+        ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(agency.getAgencyId());
+        return res;
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 3018846910..106ff99da5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -169,6 +169,22 @@
         ORDER BY created_time DESC
     </select>
 
+    <!-- 当没有工作人员最近访问的gridId时查询该用户所属的组织机关信息 -->
+    <select id="selectAgencyInfoWhenGridIdIsNull" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
+       SELECT
+        agency.ID AS agencyId,
+        agency.ORGANIZATION_NAME AS agencyName,
+        agency.PIDS AS agencyIdPath,
+        agency.ALL_PARENT_NAME AS agencyNamePath,
+        agency.CUSTOMER_ID AS customerId
+    FROM
+     CUSTOMER_STAFF_AGENCY staff
+     LEFT JOIN CUSTOMER_AGENCY agency ON staff.AGENCY_ID = agency.ID AND agency.DEL_FLAG = '0'
+    WHERE
+       staff.DEL_FLAG = '0'
+        AND staff.USER_ID = #{staffId}
+    </select>
+
     <!-- 查询一个工作人员最近登录的网格以及机关信息 -->
     <select id="selectAgencyAndGridInfoExt" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
     SELECT
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 63e3380b6b..21a70de787 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -269,15 +269,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("epmetuser/customerstaff/getstaffinfolist")
     Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestBody UserIdsFormDTO formDTO);
 
-    /**
-     * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-     * @param staffId
-     * @return
-     * @author wangc
-     * @date 2020.08.17 17:45
-     **/
-    @GetMapping("/epmetuser/staffagencyvisited/latestagency/{staffId}")
-    Result<String> latestAgency(@PathVariable("staffId") String staffId);
 
     /**
      * 修改根管理员信息
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 480ba8862e..8b81b57dd2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -189,11 +189,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffInfoList", formDTO);
     }
 
-    @Override
-    public Result<String> latestAgency(String staffId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestAgency", staffId);
-    }
-
     @Override
     public Result updateRootManage(UpdateRootManageFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateRootManage", formDTO);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
index 69ffa0ebd8..71ad8f1962 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java
@@ -63,16 +63,4 @@ public class StaffAgencyVisitedController {
 	}
 
 
-	/**
-	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-	 * @param staffId
-	 * @return
-	 * @author wangc
-	 * @date 2020.08.17 17:45
-	 **/
-	@GetMapping(value = "latestagency/{staffId}")
-	public Result<String> latestAgency(@PathVariable("staffId") String staffId){
-		return new Result<String>().ok(staffAgencyVisitedService.getLatestStaffAgencyId(staffId));
-	}
-
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java
index 4e55a5e731..4358e4910e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java
@@ -40,5 +40,4 @@ public interface StaffAgencyVisitedDao extends BaseDao<StaffAgencyVisitedEntity>
     StaffLatestAgencyResultDTO selectLatestStaffWechatLoginRecord(String openId);
 
 
-    StaffLatestAgencyResultDTO selectLatestCustomer(String userId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java
index d70addb077..9d584aa2e6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java
@@ -114,13 +114,5 @@ public interface StaffAgencyVisitedService extends BaseService<StaffAgencyVisite
 	 **/
 	Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO);
 
-	/**
-	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-	 * @param staffId
-	 * @return
-	 * @author wangc
-	 * @date 2020.08.17 17:45
-	**/
-	String getLatestStaffAgencyId(String staffId);
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
index 7e2e2fd706..8118bbe6f6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
@@ -127,20 +127,6 @@ public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVi
 		return new Result();
 	}
 
-	/**
-	 * @Description 根绝staffId查询最近一次(既当前)登录到的AgencyId
-	 * @param staffId
-	 * @return
-	 * @author wangc
-	 * @date 2020.08.17 17:45
-	 **/
-	@Override
-	public String getLatestStaffAgencyId(String staffId) {
-		StaffLatestAgencyResultDTO latestAgency =
-			baseDao.selectLatestCustomer(staffId);
-		if(null != latestAgency)
-			return latestAgency.getAgencyId();
-		return null;
-	}
+
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml
index 82bc2cace3..faaa5757e9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml
@@ -35,19 +35,5 @@
             sav.CREATED_TIME DESC
             LIMIT 1
     </select>
-    <select id="selectLatestCustomer" parameterType="java.lang.String"
-            resultType="com.epmet.dto.result.StaffLatestAgencyResultDTO">
-        SELECT
-            sav.CUSTOMER_ID,
-            sav.STAFF_ID,
-            sav.AGENCY_ID
-        FROM
-            staff_agency_visited sav
-        WHERE
-            sav.DEL_FLAG = '0'
-          AND sav.STAFF_ID =#{userId}
-        ORDER BY
-            sav.CREATED_TIME DESC
-        LIMIT 1
-    </select>
+
 </mapper>
\ No newline at end of file