From b51abb8feb39579ab84aa7f3e65148981d9ea581 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 23 May 2023 16:18:00 +0800
Subject: [PATCH] =?UTF-8?q?lingshanScreen/partymemberList=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=A1=8C=E6=94=BF+=E5=85=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LingShanScreenController.java    | 11 +++++++++--
 .../service/LingShanScreenService.java          |  2 +-
 .../service/impl/LingShanScreenServiceImpl.java | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java
index 4d4d4ef6c5..cad4fd458a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java
@@ -14,6 +14,7 @@ import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActT
 import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -81,8 +82,14 @@ public class LingShanScreenController {
      * @date: 2023/4/14 3:20 PM
      */
     @GetMapping("partymemberList")
-    public Result<List<LingShanScreenPartyOrgTreeResultDTO.Partymember>> partymemberList(@RequestParam("partyOrgId") String partyOrgId) {
-        List<LingShanScreenPartyOrgTreeResultDTO.Partymember> l = lingShanScreenService.partymemberListByPartyOrgId(partyOrgId);
+    public Result<List<LingShanScreenPartyOrgTreeResultDTO.Partymember>> partymemberList(@RequestParam(value = "partyOrgId", required = false) String partyOrgId,
+                                                                                         @RequestParam(value = "agencyId", required = false) String agencyId) {
+
+        if (StringUtils.isAllBlank(partyOrgId, agencyId)) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "党组织ID和行政组织ID必须传一个");
+        }
+
+        List<LingShanScreenPartyOrgTreeResultDTO.Partymember> l = lingShanScreenService.partymemberListByPartyOrgId(partyOrgId, agencyId);
         return new Result().ok(l);
     }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java
index 265467a062..3bb6c52f76 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java
@@ -44,7 +44,7 @@ public interface LingShanScreenService {
      * @author: WangXianZhang
      * @date: 2023/4/14 3:22 PM
      */
-    List<LingShanScreenPartyOrgTreeResultDTO.Partymember> partymemberListByPartyOrgId(String partyOrgId);
+    List<LingShanScreenPartyOrgTreeResultDTO.Partymember> partymemberListByPartyOrgId(String partyOrgId, String agencyId);
 
     /**
      * @description: agencyId下的党组织活动数统计
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java
index eb7d429307..32c44d5198 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java
@@ -168,7 +168,22 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
     }
 
     @Override
-    public List<LingShanScreenPartyOrgTreeResultDTO.Partymember> partymemberListByPartyOrgId(String partyOrgId) {
+    public List<LingShanScreenPartyOrgTreeResultDTO.Partymember> partymemberListByPartyOrgId(String partyOrgId, String agencyId) {
+
+        if (StringUtils.isBlank(partyOrgId)) {
+            // 没有传党组织id，使用行政组织id去查询对应的党组织，然后给党组织id赋值
+            LambdaQueryWrapper<IcPartyOrgEntity> q = new LambdaQueryWrapper<>();
+            q.eq(IcPartyOrgEntity::getAgencyId, agencyId);
+            q.le(IcPartyOrgEntity::getPartyOrgType, 4);// agency，那就只查询<=4的，即省委~社区党委
+            IcPartyOrgEntity partyOrg = icPartyOrgDao.selectOne(q);
+            if (partyOrg == null) {
+                logger.warn("根据该行政组织为找到对应的党组织信息：" + agencyId);
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "根据该行政组织为找到对应的党组织信息");
+            }
+
+            partyOrgId = partyOrg.getId();
+        }
+
         IcPartyOrgEntity partyOrg = icPartyOrgDao.selectById(partyOrgId);
         LambdaQueryWrapper<IcPartyMemberEntity> query = null;
         if (partyOrg == null) {