接口自测问题修改

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());

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());
             }
         }
 

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<ResiTopicCommentEntity> {
      * @Description  屏蔽自己发表的话题且自己评论过的评论
      * @author sun
      */
-    void upTopicCommentList(@Param("delIdList") List<String> delIdList, @Param("userId") String userId);
+    void upTopicCommentList(@Param("delIdList") List<String> delIdList, @Param("userId") String userId, @Param("operateUserId") String operateUserId);
 
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml

@@ -40,6 +40,7 @@
           AND OPERATE_STATUS = 'under_auditting'
     </select>
 
+    <!-- 更新最新一条进组记录数据状态 -->
     <update id="upByGroupAndUserId">
         UPDATE group_memeber_operation
         SET operate_status = 'removed',

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@@ -165,6 +165,7 @@
           AND `STATUS` = 'approved'
     </select>
 
+    <!-- 修改群成员关系数据状态 -->
     <update id="delByGroupAndUserId">
         UPDATE resi_group_member
         SET del_flag = '1',

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml

@@ -112,13 +112,15 @@
         AND re.created_by = #{userId}
     </select>
 
+    <!-- 屏蔽当前人员对某些话题的评论 -->
     <update id="upTopicCommentList">
         UPDATE resi_topic_comment
         SET `status` = 'hidden',
-            updated_by = #{userId},
+            updated_by = #{operateUserId},
             updated_time = NOW()
         WHERE
             del_flag = '0'
+        AND created_by = #{userId}
         <foreach collection="delIdList" item="topicId" open="AND (" close=")" separator=" OR ">
             topic_id = #{topicId}
         </foreach>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -571,6 +571,7 @@
         and rt.ISSUE_ID=#{issueId}
     </select>
 
+    <!-- 查询小组内还未成为议题的是当前人员创建的讨论中的话题 -->
     <select id="selectIdList" resultType="java.lang.String">
         SELECT
             id
@@ -578,7 +579,7 @@
             resi_topic
         WHERE
             del_flag = '0'
-        AND shift_issue = '1'
+        AND shift_issue = '0'
         AND `status` = 'discussing'
         AND group_id = #{groupId}
         AND created_by = #{userId}