From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 5e10984..d613c66 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
@@ -275,8 +275,10 @@
Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
doPager.getRecords().forEach(data -> {
- if (data.getUserType() != 1) {
- data.setReleaseName(data.getCommunityName());
+ if(data.getUserType()!=null){
+ if (data.getUserType() != 1) {
+ data.setReleaseName(data.getCommunityName());
+ }
}
});
return R.ok(doPager);
@@ -663,6 +665,7 @@
DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
vo.setReleaseName(user.getName());
+ vo.setImageUrl(user.getImageUrl());
// 查询话题名称
if (comActNeighborCircleDO.getTopicId() != null) {
@@ -917,7 +920,7 @@
public R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO){
ComActNeighborCircleDO neighborCircleDO = new ComActNeighborCircleDO();
neighborCircleDO.setId(circleTopicAppDTO.getId());
- neighborCircleDO.setIsDel(ComActNeighborCircleDO.isDel.yes);
+ neighborCircleDO.setIsDel(ComActNeighborCircleDO.IsDel.YES);
if(this.baseMapper.updateById(neighborCircleDO) > 0){
return R.ok();
}
--
Gitblit v1.7.1