话题、评论接口修改

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -390,8 +390,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
         //1.获取话题基本信息
         ResiTopicEntity topicDetail = baseDao.selectById(topicId);
+        if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){
+            return new Result().error();
+        }
         ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO();
-
+        resultDTO.setTopicId(topicId);
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(TopicConstant.TOPIC_ID,topicId);
@@ -487,7 +490,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             ResiGroupMemberDTO leaderVerify = resiGroupMemberDao.selectLeaderMember(topic.getGroupId());
             if(null != leaderVerify){
                 //1.2判断是否是组长
-                if(!StringUtils.equals(leaderVerify.getId(),userId)){
+                if(!StringUtils.equals(leaderVerify.getCustomerUserId(),userId)){
                     //非组长，无权限进行操作
                     return new Result().error();
                 }else{

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

@@ -158,12 +158,10 @@
         <if test='null != delFlag and "" != delFlag'>
            DEL_FLAG = #{delFlag} ,
         </if>
-        <if test='null != updatedBy and "" != updatedBy'>
-           UPDATED_BY = #{updatedBy} ,
-        </if>
         <if test='null != topicContent and "" != topicContent'>
            TOPIC_CONTENT = #{topicContent} ,
         </if>
+        UPDATED_BY = #{updatedBy} ,
         UPDATED_DATE = NOW()
       </set>
       WHERE