From ddcc808863239096ecd5f6394b6e6ef5551b26f4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 10:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E5=8D=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/feign/GovOrgOpenFeignClient.java  |  9 +++++++++
 .../fallback/GovOrgOpenFeignClientFallback.java      |  5 +++++
 .../com/epmet/controller/CustomerGridController.java | 12 ++++++++++++
 .../src/main/java/com/epmet/dao/CustomerGridDao.java |  8 ++++++++
 .../java/com/epmet/service/CustomerGridService.java  |  8 ++++++++
 .../epmet/service/impl/CustomerGridServiceImpl.java  | 11 +++++++++++
 .../src/main/resources/mapper/CustomerGridDao.xml    |  7 +++++++
 7 files changed, 60 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 2ac3978628..7237abcc5b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -398,4 +398,13 @@ public interface GovOrgOpenFeignClient {
     @PostMapping("/gov/org/customergrid/selectorgnamebytype")
     Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList);
 
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    @PostMapping("/gov/org/customergrid/selectorgsbyuserid")
+    Result<List<String>> selectOrgsByUserId(@RequestParam("userId")String userId);
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 84b3cb74c2..91f9052c84 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -230,6 +230,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList);
     }
 
+    @Override
+    public Result<List<String>> selectOrgsByUserId(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgsByUserId", userId);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index 7dc0f3f385..c765a58962 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -274,4 +274,16 @@ public class CustomerGridController {
     public Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList){
         return new Result<List<String>>().ok(customerGridService.selectOrgNameByType(formList));
     }
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    @PostMapping("/selectorgsbyuserid")
+    public Result<List<String>> selectOrgsByUserId(@RequestParam("userId")String userId){
+        return new Result<List<String>>().ok(customerGridService.selectOrgsByUserId(userId));
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 956405698b..fae6640a7d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -292,4 +292,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/8/4 6:25 下午
      */
     List<String> selectOrgNameByType(@Param("orgIds") List<String> orgIds);
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    List<String> selectOrgsByUserId(@Param("userId") String userId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index 773ebd45e7..78221d8fa8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -311,4 +311,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/8/4 6:14 下午
      */
     List<String> selectOrgNameByType(List<String> formList);
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    List<String> selectOrgsByUserId(String userId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 875f2c04dd..23de67608c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -743,4 +743,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public List<String> selectOrgNameByType(List<String> formList) {
         return baseDao.selectOrgNameByType(formList);
     }
+
+    /**
+     * @Description  根据人查询所在组织
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 10:08 上午
+     */
+    @Override
+    public List<String> selectOrgsByUserId(String userId) {
+        return baseDao.selectOrgsByUserId(userId);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 5c5fae63b3..0667d009c4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -611,4 +611,11 @@
             </foreach>
                 )
     </select>
+
+    <!-- 根据人查询所在组织 -->
+    <select id="selectOrgsByUserId" resultType="java.lang.String">
+        SELECT GRID_ID AS orgId FROM customer_staff_grid WHERE del_flag = '0' AND USER_ID = #{userId}
+        union ALL
+        SELECT agency_id AS orgId  FROM customer_staff_agency WHERE del_flag = '0' and USER_ID = #{userId}
+    </select>
 </mapper>