From 7ee17a00bd47309ea1a61e28f2e44f621a01b8cd Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 27 四月 2022 11:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 6aace56..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)){
@@ -307,6 +305,7 @@
comActNeighborCircleDO.setLastCommentNum(0);
comActNeighborCircleDO.setLastFabulousNum(0);
comActNeighborCircleDO.setLastViewsNum(0);
+ comActNeighborCircleDO.setBelongType(addVO.getBelongType());
this.baseMapper.insert(comActNeighborCircleDO);
return R.ok();
}
@@ -341,7 +340,7 @@
public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
new Page<>(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()),
- neighborCircleAppDTO.getUserId());
+ neighborCircleAppDTO.getUserId(),neighborCircleAppDTO.getBelongType());
if (!neighborCircleIPage.getRecords().isEmpty()) {
for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
// 查询点赞信息
@@ -665,6 +664,7 @@
DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
vo.setReleaseName(user.getName());
+ vo.setImageUrl(user.getImageUrl());
// 查询话题名称
if (comActNeighborCircleDO.getTopicId() != null) {
--
Gitblit v1.7.1