From 78e3574f7cb396c50f5dfa5d88a5beb3c4b278c8 Mon Sep 17 00:00:00 2001
From: liaocc <liaocc@chinaweal.com.cn>
Date: Sat, 10 Jan 2026 15:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8C=89=E7=BA=A7=E5=88=AB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EBaseinfoController.java       |  3 +++
 .../service/impl/EBaseinfoServiceImpl.java    | 21 ++++++++++++++++++-
 .../mapper/aiccs/abnormal/EBaseinfoMapper.xml |  7 +++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java
index efe63b8..61fdde0 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java
@@ -629,8 +629,11 @@ public class EBaseinfoController extends BaseController {
     public RestResult<?> queryCphStatistics(@RequestBody Map<String, Object> customParamMap, HttpServletRequest request) {
         AICUser aicUser = getLoginUser(request);
         if (aicUser != null) {
+            log.debug("orgId: {} regionId: {}", aicUser.getOrgID(), aicUser.getRegionID());
             String regionId = aicUser.getRegionID();
             customParamMap.put("regionId", regionId);
+        } else {
+            log.error("用户未登录");
         }
         List<ComprehensiveStat> rs = eBaseinfoService.queryCphStat(customParamMap);
         return RestResult.ok(rs);
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java
index 979f9ef..3e5cf03 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java
@@ -686,6 +686,7 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl<EBaseinfoMapper, EBase
     public List<ComprehensiveStat> queryCphStat(Map<String, Object> customParamMap) {
         customParamMap = checkSearchDate(customParamMap);
         List<ComprehensiveStat> rs = baseMapper.queryCphStat(customParamMap);
+        String regionId = (String) customParamMap.get("regionId");
 
         // 一笔业务包含多个主体的要统计主体数量,xiangwu
 /*
@@ -704,7 +705,25 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl<EBaseinfoMapper, EBase
             orgnList.add(comprehensiveStat.getOrgn());
         }
         for (RegulatoryVO regulatoryVO : regulatoryVOS) {
-            if (StringUtils.isNotBlank(regulatoryVO.getOrgNUmber()) && !orgnList.contains(regulatoryVO.getOrgNUmber())) {
+            String orgNumber = regulatoryVO.getOrgNUmber();
+            if (StringUtils.isBlank(regionId) || "150000".equals(regionId)) {
+                if (StringUtils.isNotBlank(orgNumber) && !(orgNumber.length() == 6 && orgNumber.endsWith("00"))) {
+                    continue;
+                }
+            } else if (regionId.length() == 6 && regionId.endsWith("00")) {
+                if (StringUtils.isNotBlank(orgNumber) && !(orgNumber.length() == 6 && orgNumber.startsWith(regionId.substring(0,4)))) {
+                    continue;
+                }
+            } else if (regionId.length() == 6) {
+                if (StringUtils.isNotBlank(orgNumber) && !orgNumber.startsWith(regionId.substring(0,6))) {
+                    continue;
+                }
+            } else {
+                if (StringUtils.isNotBlank(orgNumber) && !orgNumber.startsWith(regionId)) {
+                    continue;
+                }
+            }
+            if (StringUtils.isNotBlank(orgNumber) && !orgnList.contains(orgNumber)) {
                 ComprehensiveStat cphStat = new ComprehensiveStat();
                 cphStat.setOrgn(regulatoryVO.getOrgNUmber());
                 cphStat.setOrgunitname(regulatoryVO.getOrgUnitName());
diff --git a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml
index ba8e250..80ad395 100644
--- a/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/abnormal/EBaseinfoMapper.xml
@@ -766,10 +766,13 @@
                 and rs2.orgn like '15%'
             </when>
             <when test="customParamMap.regionId.length() == 6 and customParamMap.regionId.endsWith('00')">
-                and rs2.orgn like #{customParamMap.regionId.substring(0,4)}||'%'
+                and rs2.orgn like left(#{customParamMap.regionId},4)||'%'
+            </when>
+            <when test="customParamMap.regionId.length() == 6">
+                and rs2.orgn like left(#{customParamMap.regionId},6)||'%'
             </when>
             <otherwise>
-                and rs2.orgn like #{customParamMap.regionId.substring(0,6)}||'%'
+                and rs2.orgn like #{customParamMap.regionId}||'%'
             </otherwise>
         </choose>
         ) jg group by orgn, orgunitname