From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index c70462f..6869959 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -64,7 +66,10 @@
private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;
@Resource
private ComActNeighborCircleTopicService comActNeighborCircleTopicService;
-
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComPbMemberDAO comPbMemberDAO;
/**
* 分页查询邻里圈列表
*
@@ -74,6 +79,18 @@
*/
@Override
public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ if(neighborCircleAppDTO.getCommunityId()==0L){
+ R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(neighborCircleAppDTO.getUserId().toString());
+ if(R.isOk(loginUserInfoVOR)){
+ LoginUserInfoVO loginUserInfoVO=loginUserInfoVOR.getData();
+ if(loginUserInfoVO!=null){
+ ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,loginUserInfoVO.getIdCard()));
+ if(comPbMemberDO!=null){
+ neighborCircleAppDTO.setCommunityId(comPbMemberDO.getCommunityId());
+ }
+ }
+ }
+ }
Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
if (!doPager.getRecords().isEmpty()) {
@@ -126,25 +143,6 @@
}
if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
- }
- //判断用户的话题是否是新增的
- if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){
- //新增邻里圈话题
- ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
- .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,neighborCircleDO.getCommunityId())
- .eq(ComActNeighborCircleTopicDO::getName,addNeighborCircleAppDTO.getTopicName()));
- if(circleTopicDO == null){
- circleTopicDO = new ComActNeighborCircleTopicDO();
- circleTopicDO.setCommunityId(neighborCircleDO.getCommunityId());
- circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName());
- circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId());
- circleTopicDO.setCreateAt(new Date());
- circleTopicDO.setCount(0);
- circleTopicDO.setHotNum(0L);
- circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
- comActNeighborCircleTopicMapper.insert(circleTopicDO);
- }
- neighborCircleDO.setTopicId(circleTopicDO.getId());
}
//判断当前邻里圈是否需要审核
if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
--
Gitblit v1.7.1