From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java
index f9f0154..f5a37e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
@@ -62,23 +64,16 @@
* @return 党组织集合
*/
@Override
- public List<PartyOrganizationVO> listPartyOrganizationAll(Long communityId) {
- List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
- List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO
- .selectList(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getCommunityId, communityId));
- if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
- comPbOrgDOS.forEach(comPbOrgDO -> {
- PartyOrganizationVO partyOrganizationVO = new PartyOrganizationVO();
+ public R listPartyOrganizationAll(PartyOrganizationVO partyOrganizationVO) {
+ IPage<PartyOrganizationVO> orgPgaeList = this.comPbOrgDAO.listPartyOrganizationAll(new Page(partyOrganizationVO.getPageNum(),partyOrganizationVO.getPageSize()),partyOrganizationVO);
+ if (!ObjectUtils.isEmpty(orgPgaeList.getRecords())) {
+ orgPgaeList.getRecords().forEach(comPbOrgDO -> {
List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(
new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getOrgId, comPbOrgDO.getId()));
- partyOrganizationVO.setId(comPbOrgDO.getId());
- partyOrganizationVO.setName(comPbOrgDO.getName());
- partyOrganizationVO.setStatus(comPbOrgDO.getStatus());
- partyOrganizationVO.setCountPerson(comPbMemberDOs.size());
- partyOrganizationVOS.add(partyOrganizationVO);
+ comPbOrgDO.setCountPerson(comPbMemberDOs.size());
});
}
- return partyOrganizationVOS;
+ return R.ok(orgPgaeList);
}
/**
--
Gitblit v1.7.1