From 5231adb181a896138c80cb6a4ba10967ef0f5644 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 14:29:21 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 1912f9e..d124e89 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -8,7 +8,9 @@
import javax.annotation.Resource;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdcardUtil;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
@@ -202,6 +204,21 @@
*/
@Override
public R pagePartyOrganization(PagePartyOrganizationVO pagePartyOrganizationVO) {
+
+ Long communityId = pagePartyOrganizationVO.getCommunityId();
+ R r = communityService.selectCommunityIds(communityId);
+ List<Long> communityIds = null;
+ if(R.isOk(r)){
+ communityIds = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ }else {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+
Page page = new Page<>();
Long pageNum = pagePartyOrganizationVO.getPageNum();
Long pageSize = pagePartyOrganizationVO.getPageSize();
--
Gitblit v1.7.1