From e05295ae676c6e6b1cff2a1bc9207d7a2e4d8a52 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 30 Mar 2021 16:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E6=B5=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/controller/ExitGroupController.java | 2 +- .../modules/group/service/impl/ExitGroupServiceImpl.java | 2 +- .../java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java | 2 +- .../main/resources/mapper/member/GroupMemeberOperationDao.xml | 1 + .../src/main/resources/mapper/member/ResiGroupMemberDao.xml | 1 + .../src/main/resources/mapper/topic/ResiTopicCommentDao.xml | 4 +++- .../src/main/resources/mapper/topic/ResiTopicDao.xml | 3 ++- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ExitGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ExitGroupController.java index 9f58b1eba7..a987253c0d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ExitGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ExitGroupController.java @@ -36,7 +36,7 @@ public class ExitGroupController { @PostMapping("removemember") public Result removeMember(@LoginUser TokenDto tokenDto, @RequestBody ExitGroupFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - if(!"".equals(formDTO.getShieldFlag())&&!"".equals(formDTO.getShieldFlag())){ + if(!"yes".equals(formDTO.getShieldFlag())&&!"no".equals(formDTO.getShieldFlag())){ throw new RenException("参数错误，是否屏蔽历史话题参数值错误"); } formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java index 0b8392a927..4116d6907c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java @@ -86,7 +86,7 @@ public class ExitGroupServiceImpl implements ExitGroupService { delIdList.addAll(commetTopicList); //3-2.本小组内屏蔽自己创建的话题发表过的评论以及别人发表的话题自己评论过的评论 if (delIdList.size() > NumConstant.ZERO) { - resiTopicCommentDao.upTopicCommentList(delIdList, formDTO.getOperateUserId()); + resiTopicCommentDao.upTopicCommentList(delIdList, formDTO.getUserId(), formDTO.getOperateUserId()); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java index efa950684b..36b7513617 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java @@ -78,6 +78,6 @@ public interface ResiTopicCommentDao extends BaseDao { * @Description 屏蔽自己发表的话题且自己评论过的评论 * @author sun */ - void upTopicCommentList(@Param("delIdList") List delIdList, @Param("userId") String userId); + void upTopicCommentList(@Param("delIdList") List delIdList, @Param("userId") String userId, @Param("operateUserId") String operateUserId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml index cd7d33e5ca..4389897bff 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml @@ -40,6 +40,7 @@ AND OPERATE_STATUS = 'under_auditting' + UPDATE group_memeber_operation SET operate_status = 'removed', diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index 013e384ec9..6fb5735ffe 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -165,6 +165,7 @@ AND `STATUS` = 'approved' + UPDATE resi_group_member SET del_flag = '1', diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml index 7fe318b292..21a0456e9f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml @@ -112,13 +112,15 @@ AND re.created_by = #{userId} + UPDATE resi_topic_comment SET `status` = 'hidden', - updated_by = #{userId}, + updated_by = #{operateUserId}, updated_time = NOW() WHERE del_flag = '0' + AND created_by = #{userId} topic_id = #{topicId} diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 183169ab08..63f7f951b3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -571,6 +571,7 @@ and rt.ISSUE_ID=#{issueId} +