From a059aa4ed7c90f6fdc2288d892eb3f2e57d94d2b Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 3 Apr 2020 09:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E3=80=81=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/resi-group/resi-group-server/pom.xml          | 2 +-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java   | 7 +++++--
 .../src/main/resources/mapper/topic/ResiTopicDao.xml       | 4 +---
 epmet-module/resi-guide/resi-guide-server/pom.xml          | 2 +-
 epmet-user/epmet-user-server/pom.xml                       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 93733b4749..87ed95fe46 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -122,7 +122,7 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+          <!--  <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index e551acd16d..002e943564 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/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{
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 5269c441c9..b1e4e7186f 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
@@ -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
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index 213e2aae32..b3eaee060f 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -134,7 +134,7 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+           <!-- <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 1020d925ff..80aa220e15 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -130,7 +130,7 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+          <!--  <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>