From 0472bdfd52cafd76120fa0f555029c7cb9aea961 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 31 Mar 2021 14:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E7=BB=84=E9=95=BF=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

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 12d4cc56d8..fafbef7b2e 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
@@ -102,7 +102,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsoup.helper.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -907,20 +906,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     private Result verifyLeader(ResiTopicEntity topic,String userId){
         if(null != topic){
             ResiGroupMemberDTO leaderVerify = resiGroupMemberDao.selectLeaderMember(topic.getGroupId());
-            if(null != leaderVerify){
-                //1.2判断是否是组长
-                if(!StringUtils.equals(leaderVerify.getCustomerUserId(),userId)){
-                    //非组长，无权限进行操作
-                    logger.error(ModuleConstant.NO_TEAMLEADER_AUTH);
-                    throw new RenException(ModuleConstant.NO_TEAMLEADER_AUTH);
-                }else{
-                    //是组长
-                    return new Result();
-                }
-            }else{
-                //未找到当前用户的成员信息
-                logger.error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
-                throw new RenException(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
+            if (null == leaderVerify) {
+                throw new RenException(String.format("没有找到该组组长,groupId=%s", topic.getGroupId()));
+            }
+            //1.2判断是否是组长
+            if (!StringUtils.equals(leaderVerify.getCustomerUserId(), userId)) {
+                //非组长，无权限进行操作
+                logger.error(ModuleConstant.NO_TEAMLEADER_AUTH);
+                throw new RenException(ModuleConstant.NO_TEAMLEADER_AUTH);
+            } else {
+                //是组长
+                return new Result();
             }
         }else{
             //未能识别该话题基本信息