From 70eb051b54b835edb3f93e701e5d07a1d21045e6 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 07 五月 2021 18:15:18 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index 76f128b..742c6aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -199,11 +200,14 @@
}
@ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
- @GetMapping("listpartyorganization")
- public R listPartyOrganization() {
+ @PostMapping("listpartyorganization")
+ public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
Long communityId = this.getCommunityId();
log.info("社区所有党组织社区id【{}】", communityId);
- return partyBuildingService.listPartyOrganization(communityId);
+ if(communityId != null){
+ comListPartyDTO.setCommunityId(communityId);
+ }
+ return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
}
public static void main(String[] args) {
--
Gitblit v1.7.1