From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
index d0ad472..69e93d1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -49,6 +49,7 @@
@Resource
private ComPbMemberDAO comPbMemberDAO;
+
/**
* 查询某个党员加入的所有党员活动
*
@@ -158,6 +159,12 @@
partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS);
partyBuildingActivityVO.setIsPerson(isPerson);
partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName());
+
+ //查询社区名称
+ if(partyBuildingActivityVO.getCommunityId() != null){
+ partyBuildingActivityVO.setCommunityName(comBpActivityDAO.selectCommunityNameByCommunityId(partyBuildingActivityVO.getCommunityId()));
+ }
+
return R.ok(partyBuildingActivityVO);
}
--
Gitblit v1.7.1