From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
index b915deb..f73fa81 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
@@ -62,7 +62,6 @@
}
circleTopicDO = new ComActNeighborCircleTopicDO();
BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
- circleTopicDO.setStatus(1);
circleTopicDO.setCreateAt(new Date());
circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId());
@@ -113,8 +112,8 @@
* @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId,Integer isZero){
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero));
+ public R getNeighborTopicByApp(Long communityId,Integer isZero,String name,Integer belongType){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name,belongType));
}
/**
@@ -126,7 +125,8 @@
public R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO){
ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
.lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,circleTopicAppDTO.getCommunityId())
- .eq(ComActNeighborCircleTopicDO::getName,circleTopicAppDTO.getName()));
+ .eq(ComActNeighborCircleTopicDO::getName,circleTopicAppDTO.getName())
+ .eq(ComActNeighborCircleTopicDO::getBelongType,circleTopicAppDTO.getBelongType()));
if(circleTopicDO == null){
circleTopicDO = new ComActNeighborCircleTopicDO();
circleTopicDO.setCommunityId(circleTopicAppDTO.getCommunityId());
@@ -136,6 +136,7 @@
circleTopicDO.setCount(0);
circleTopicDO.setHotNum(0L);
circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
+ circleTopicDO.setBelongType(circleTopicAppDTO.getBelongType());
this.baseMapper.insert(circleTopicDO);
}
return R.ok(circleTopicDO);
--
Gitblit v1.7.1