From 1e5a1e77b06dccbadf5a36b7c5cb1a20187e935a Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期三, 10 三月 2021 16:03:47 +0800
Subject: [PATCH] 党员活动关系表增加userId字段，解决党员信息删除后无法查看原有的活动
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java | 5 +++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
index d54ae34..fc49de0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -69,6 +69,9 @@
"AND t.create_at BETWEEN #{comActMessageVO.publishAtBegin} \n" +
"AND #{comActMessageVO.publishAtEnd} \n" +
" </if> " +
+ "<if test='comActMessageVO.type != null and comActMessageVO.type !=0'>" +
+ " AND t.type=#{comActMessageVO.type} \n" +
+ " </if> " +
" order by create_at desc"+
"</script>")
IPage<PageComActMessageVO> pageMyCommunityMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java
index 00613a2..576c9cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java
@@ -34,6 +34,11 @@
private Long memberId;
/**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
* 报名时间
*/
@TableField(fill = FieldFill.INSERT)
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 8347a58..e02d3f8 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
@@ -280,11 +280,11 @@
@Override
public R listActivity(Long userId, Long communityId) {
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
+ /*Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
if (ObjectUtils.isEmpty(memberId)) {
return R.fail();
- }
- List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, memberId));
+ }*/
+ List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getUserId, userId));
if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
return R.fail();
}
--
Gitblit v1.7.1