From e27f13b1d003ce37e658d76455bb750b383ec45c Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 29 四月 2021 22:06:17 +0800
Subject: [PATCH] none

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 1f655da..c82e518 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
@@ -224,7 +224,9 @@
             return R.fail("id有误!");
         }
         neighborCircleDO.setStatus(editVO.getStatus());
-        neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
+        if(editVO.getRefuseReason()!=null){
+            neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
+        }
         this.baseMapper.updateById(neighborCircleDO);
         return R.ok();
     }
@@ -501,8 +503,10 @@
         if(commentDO==null){
             return R.fail("id有误!");
         }
+        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
         ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
         BeanUtils.copyProperties(commentDO,vo);
+        vo.setUserName(user.getName());
         return R.ok(vo);
     }
 
@@ -510,6 +514,9 @@
     public R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto) {
         Page<ComActNeighborCircleCommentReplyDO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
         Page<ComActNeighborCommentReplyByAdminVO> replyPage = neighborCircleCommentReplyDAO.selectListByComment(page, dto);
+        replyPage.getRecords().forEach(reply->{
+
+        });
         return R.ok(replyPage);
     }
 
@@ -519,8 +526,11 @@
         if(replyDO==null){
             return R.fail("id有误!");
         }
+        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(replyDO.getUserId());
         ComActNeighborCommentReplyByAdminVO vo = new ComActNeighborCommentReplyByAdminVO();
         BeanUtils.copyProperties(replyDO,vo);
+        vo.setUserName(user.getName());
+        vo.setUserPhone(user.getPhone());
         return R.ok(vo);
     }
 

--
Gitblit v1.7.1