From 7ba749e70dc87fb57efd58cc439e31c93fd7076f Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 29 四月 2021 18:18:29 +0800
Subject: [PATCH] no
---
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 b5f22fe..14a1d96 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
@@ -165,7 +165,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();
}
@@ -438,8 +440,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);
}
@@ -447,6 +451,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);
}
@@ -456,8 +463,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