From 475c55cd0fdfa8372d4bc56902d455bdca081096 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Thu, 17 Jun 2021 15:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=89=87=E9=95=BF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommunityBossController.java              |  1 +
 .../impl/CommunityBossServiceImpl.java        | 10 +++-
 .../impl/UserPointsServiceImpl.java           | 20 ++------
 .../communityboss/communityboss-mapper.xml    | 51 ++++++++++---------
 4 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/cm/systemcity/controller/apis/communityboss/CommunityBossController.java b/src/main/java/com/cm/systemcity/controller/apis/communityboss/CommunityBossController.java
index afb201f..b2b695f 100755
--- a/src/main/java/com/cm/systemcity/controller/apis/communityboss/CommunityBossController.java
+++ b/src/main/java/com/cm/systemcity/controller/apis/communityboss/CommunityBossController.java
@@ -202,6 +202,7 @@ public class CommunityBossController extends AbstractController {
     public List<CommunityBossDTO> listCommunityBossByCommunity(@PathVariable("communityId") String communityId) throws SearchException {
         Map<String, Object> params = requestParams();
         params.put("communityId", communityId);
+
         return communityBossService.listCommunityBossByCommunity(params);
     }
 
diff --git a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java
index 1129dae..d1809ad 100755
--- a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java
@@ -310,7 +310,15 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun
 
     @Override
     public List<CommunityBossDTO> listCommunityBossByCommunity(Map<String, Object> params) throws SearchException {
-        return communityBossDao.listCommunityBossByCommunity(params);
+        Object communityBossLevel = params.get("communityBossLevel");
+        List<CommunityBossDTO> communityBossDTOs;
+        if (communityBossLevel == null || StringUtils.equals("1", communityBossLevel.toString())) {
+            communityBossDTOs = communityBossDao.listCommunityBoss(params);
+        } else {
+            communityBossDTOs = communityBossDao.listCommunityBossByCommunity(params);
+        }
+        setUserInfo(communityBossDTOs);
+        return communityBossDTOs;
     }
 
     @Override
diff --git a/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java b/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java
index 0443a38..efc5e18 100755
--- a/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java
@@ -486,19 +486,7 @@ public class UserPointsServiceImpl extends AbstractService implements IUserPoint
             params.put("communityBossLevel", communityBossDTO.getCommunityBossLevel());
             List<CommunityBossDTO> communityBossDTOs = communityBossService.listCommunityBossByCommunity(params);
             for (CommunityBossDTO communityBoss : communityBossDTOs) {
-                /**
-                boolean isSelf = false;
-                for (String userId : userIdArray) {
-                    if (StringUtils.equals(communityBoss.getCommunityBossId(), userId)) {
-                        isSelf = true;
-                        break;
-                    }
-                }
-                if (isSelf) {
-                    continue;
-                }
-                 **/
-                bgUserIdArray.add(communityBoss.getCommunityBossId());
+                bgUserIdArray.add(communityBoss.getCommunityBossUserId());
             }
         }
         GridMemberGridFullDTO gridMemberGridFullDTO = new GridMemberGridFullDTO();
@@ -548,10 +536,10 @@ public class UserPointsServiceImpl extends AbstractService implements IUserPoint
             List<CommunityBossDTO> communityBossDTOs = communityBossService.listCommunityBossByCommunity(params);
             for (CommunityBossDTO communityBoss : communityBossDTOs) {
                 // 自己的跳过
-                if (StringUtils.equals(communityBoss.getCommunityBossId(), userIdArray.get(0))) {
+                if (StringUtils.equals(communityBoss.getCommunityBossUserId(), userIdArray.get(0))) {
                     continue;
                 }
-                bgUserIdArray.add(communityBoss.getCommunityBossId());
+                bgUserIdArray.add(communityBoss.getCommunityBossUserId());
             }
         }
         GridMemberGridFullDTO gridMemberGridFullDTO = new GridMemberGridFullDTO();
@@ -653,7 +641,7 @@ public class UserPointsServiceImpl extends AbstractService implements IUserPoint
         // 创建userId集合，用于请求GridService接口。
         List<String> userIdList = new ArrayList<>();
         for (CommunityBossDTO communityBossDTO : communityBossDTOs) {
-            userIdList.add(communityBossDTO.getCommunityBossId());
+            userIdList.add(communityBossDTO.getCommunityBossUserId());
         }
         List<GridDTO> userAndPointsDTOs = listUserPointsByGridService(userIdList);
         return userAndPointsDTOs;
diff --git a/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml b/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml
index ed61a34..b0e7ff4 100755
--- a/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml
+++ b/src/main/resources/mybatis/mapper/communityboss/communityboss-mapper.xml
@@ -288,41 +288,42 @@
             t1.community_boss_user_id,
             t1.community_boss_parent_id,
             t1.community_boss_parent_user_id,
-            t2.community_id,
+            t2.community_id
         FROM
             city_community_boss t1
-        LEFT JOIN
+        INNER JOIN
             city_community_boss_community  t2
         ON
             t1.community_boss_id = t2.community_boss_id
-        <if test="communityId != null and communityId != '' and communityId != 'nocummonity'">
-        AND
-            t2.community_id = #{communityId}
-        </if>
-        <if test="communityIds != null and communityIds.size > 0">
-        AND
-            t2.community_id IN
-            <foreach collection="communityIds" index="index" open="(" separator="," close=")">
-            #{communityIds[${index}]}
-            </foreach>
-        </if>
-        <if test="communityBossLevel != null and communityBossLevel != ''">
-        AND
-            t1.community_boss_level = #{communityBossLevel}
-        </if>
-        <if test="communityBossIds != null and communityBossIds != ''">
-        AND
-            t1.community_boss_id IN
-            <foreach collection="communityBossIds" index="index" open="(" separator="," close=")">
-                #{communityBossIds[index]}
-            </foreach>
-        </if>
+        <where>
+            <if test="communityId != null and communityId != '' and communityId != 'nocummonity'">
+                t2.community_id = #{communityId}
+            </if>
+            <if test="communityIds != null and communityIds.size > 0">
+            AND
+                t2.community_id IN
+                <foreach collection="communityIds" index="index" open="(" separator="," close=")">
+                #{communityIds[${index}]}
+                </foreach>
+            </if>
+            <if test="communityBossLevel != null and communityBossLevel != ''">
+            AND
+                t1.community_boss_level = #{communityBossLevel}
+            </if>
+            <if test="communityBossIds != null and communityBossIds != ''">
+            AND
+                t1.community_boss_id IN
+                <foreach collection="communityBossIds" index="index" open="(" separator="," close=")">
+                    #{communityBossIds[index]}
+                </foreach>
+            </if>
+        </where>
         GROUP BY
             t1.community_boss_id,
             t1.community_boss_user_id,
             t1.community_boss_parent_id,
             t1.community_boss_parent_user_id,
-            t2.community_id,
+            t2.community_id
     </select>
 
     <!-- 片长详情列表 -->