From fd0d726a3384d651b2924ef53995e45f20403e83 Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Tue, 28 Jul 2026 16:02:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=BE=88=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ZoneDetailServiceImpl.java   | 32 +++++--------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java
index 8e7d8c5fb..607447720 100644
--- a/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java
+++ b/microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java
@@ -224,13 +224,13 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
         Date[] lastWeek = getLastWeek();
         //专区文章数统计
         ZoneDetailDataVo articlesGroupByKey = zoneDetailMapper
-                .countArticlesGroupByKey(lastWeek[0],lastWeek[1],zoneDetail.getKey()) ;
+                .countArticlesGroupByKey(lastWeek[0], lastWeek[1], zoneDetail.getKey());
         if (articlesGroupByKey != null) {
             zoneDetailDataVo.setWeekArticles(articlesGroupByKey.getWeekArticles());
         }
         //专区浏览数据统计
         ZoneDetailDataVo puVsGroupByKey = zoneDetailMapper
-                .countPUVsGroupByKey(lastWeek[0],lastWeek[1],zoneDetail.getKey()) ;
+                .countPUVsGroupByKey(lastWeek[0], lastWeek[1], zoneDetail.getKey());
         if (puVsGroupByKey != null) {
             zoneDetailDataVo.setWeekPV(puVsGroupByKey.getWeekPV());
             zoneDetailDataVo.setWeekUV(puVsGroupByKey.getWeekUV());
@@ -923,26 +923,11 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
         ZoneDetail zoneDetail = zoneDetailMapper.selectZoneDetailById(zoneId);
         Set<String> usernameSet = new HashSet<>();
         // 获取专区会员数
-        ZoneMemberSearchVo zoneMemberSearchVo = new ZoneMemberSearchVo();
-        zoneMemberSearchVo.setZoneId(zoneId);
-        List<ZoneMember> zoneMemberList = zoneMemberMapper.selectZoneMemberList(zoneMemberSearchVo);
-        zoneMemberList.forEach(x -> {
-            if (x.getSysUser() != null) {
-                usernameSet.add(x.getSysUser().getUserName());
-            }
-        });
+        ZoneMember zoneMemberSearch = new ZoneMember();
+        zoneMemberSearch.setZoneId(zoneId);
+        zoneMemberSearch.setIsAudit(ZoneConstants.MEMBER_AUDIT_PASS);
+        Integer zoneMemberCount = zoneMemberMapper.selectCountByZoneId(zoneMemberSearch);
 
-        // 获取专区内用户列表
-        GenericsTableDataInfo<SysUserDeptRole> userTable = FeignUtils.getReturnData(
-                remoteUserService.searchUserIdentifierListByDept(zoneDetail.getDeptId(), null, null, null, SecurityConstants.INNER)
-        );
-        if (userTable != null && userTable.getTotal() > 0) {
-            userTable.getRows().forEach(x -> {
-                if (x.getSysUser() != null) {
-                    usernameSet.add(x.getSysUser().getUserName());
-                }
-            });
-        }
         // 获取仓库贡献者数量
         ZoneProjectSearchVo zoneProjectSearchVo = new ZoneProjectSearchVo();
         zoneProjectSearchVo.setZoneId(zoneId);
@@ -963,7 +948,7 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
                 }
             }
         }
-        zoneStatisticsVo.setCommunityUserCount((long) usernameSet.size());
+        zoneStatisticsVo.setCommunityUserCount((long) usernameSet.size() + zoneMemberCount);
         Long cmsDocCount = FeignUtils.getReturnData(remoteCmsService.getCmsCountByDeptId(zoneDetail.getDeptId(), SecurityConstants.INNER));
         zoneStatisticsVo.setCmsDocCount(cmsDocCount == null ? 0L : cmsDocCount);
         Long cmsDocVisits = FeignUtils.getReturnData(remoteCmsService.getCmsDocVisitsByDeptId(zoneDetail.getDeptId(), SecurityConstants.INNER));
@@ -971,8 +956,7 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
 
         ZoneResource zoneResource = new ZoneResource();
         zoneResource.setZoneId(zoneId);
-        List<ZoneResource> zoneResourceList = zoneResourceMapper.selectZoneResourceList(zoneResource);
-        zoneStatisticsVo.setResourceCount((long) zoneResourceList.size());
+        zoneStatisticsVo.setResourceCount(Long.valueOf(zoneResourceMapper.selectZoneResourceCount(zoneResource)));
 
         ZoneSpecialProject zoneSpecialProject = new ZoneSpecialProject();
         zoneSpecialProject.setZoneId(zoneId);