From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:48:24 +0800
Subject: [PATCH] #feat 修改别名

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java |   66 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 28 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..694efaa 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
@@ -1,22 +1,33 @@
 package com.panzhihua.service_dangjian.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.exceptions.PartyBuildingMemberException;
 import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
 import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
 import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.partybuilding.*;
 import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
 import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
-import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.model.vos.user.SysUserVO;
 import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_dangjian.dao.*;
+import com.panzhihua.service_dangjian.model.dos.ComPbDynDO;
+import com.panzhihua.service_dangjian.model.dos.ComPbDynUserDO;
+import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
+import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
+import com.panzhihua.service_dangjian.service.ComPbMemberService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -24,23 +35,12 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.constants.UserConstants;
-import com.panzhihua.common.exceptions.PartyBuildingMemberException;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.partybuilding.*;
-import com.panzhihua.common.model.vos.user.SysUserVO;
-import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.SensitiveUtil;
-import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_dangjian.dao.*;
-import com.panzhihua.service_dangjian.model.dos.*;
-import com.panzhihua.service_dangjian.service.ComPbMemberService;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import static java.util.Objects.nonNull;
 
@@ -66,8 +66,6 @@
     private ComPbDynDAO comPbDynDAO;
     @Resource
     private ComPbDynUserDAO comPbDynUserDAO;
-    @Resource
-    private CommunityService communityService;
     @Resource
     private UserService userService;
 
@@ -202,6 +200,18 @@
      */
     @Override
     public R pagePartyOrganization(PagePartyOrganizationVO pagePartyOrganizationVO) {
+
+        Long communityId = pagePartyOrganizationVO.getCommunityId();
+
+        if (null != communityId){
+            List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+            if (CollUtil.isEmpty(communityIds)) {
+                communityIds = new ArrayList<>();
+                communityIds.add(communityId);
+            }
+            pagePartyOrganizationVO.setCommunityIds(communityIds);
+        }
+
         Page page = new Page<>();
         Long pageNum = pagePartyOrganizationVO.getPageNum();
         Long pageSize = pagePartyOrganizationVO.getPageSize();

--
Gitblit v1.7.1