From 034bcafa30835156cc39d7e58a6720355e19b9b9 Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Wed, 14 Jan 2026 14:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E5=BC=82=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E7=94=A8=E4=BF=AE=E5=A4=8D=E6=94=B9=E6=88=90=E6=8C=89=E5=B1=9E?=
 =?UTF-8?q?=E5=9C=B0=E6=9C=BA=E5=85=B3=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abnormal/controller/BizRemListController.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java
index 6101bdc..677bd4a 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java
@@ -275,23 +275,25 @@ public class BizRemListController extends BaseController implements ServletConte
             wrapper.eq(EBaseinfo::getPripid, tsAbnList.getPripid());
             EBaseinfo eBaseinfo = eBaseinfoService.getOne(wrapper);
             Integer orgLevel = org.getOrgLevel();
+            //主体的判断机关，如果没有属地就取登记机关
+            String entOrg = StringUtils.isNotEmpty(eBaseinfo.getSuporg()) ? eBaseinfo.getSuporg() : eBaseinfo.getRegorg();
             //根据机构等级判断
             if (orgLevel == 1) {    //省局
                 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
                         StringUtils.substring(aicUser.getRegionID(), 0, 2),
-                        StringUtils.substring(eBaseinfo.getRegorg(), 0, 2));
+                        StringUtils.substring(entOrg, 0, 2));
             } else if (orgLevel == 2) {    //市局
                 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
                         StringUtils.substring(aicUser.getRegionID(), 0, 4),
-                        StringUtils.substring(eBaseinfo.getRegorg(), 0, 4));
+                        StringUtils.substring(entOrg, 0, 4));
             } else if (orgLevel == 3) {    //区局
                 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
                         StringUtils.substring(aicUser.getRegionID(), 0, 6),
-                        StringUtils.substring(eBaseinfo.getRegorg(), 0, 6));
+                        StringUtils.substring(entOrg, 0, 6));
             } else if (orgLevel >= 4) {    //所
                 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals(
                         StringUtils.substring(aicUser.getRegionID(), 0, 6),
-                        StringUtils.substring(eBaseinfo.getRegorg(), 0, 6));
+                        StringUtils.substring(entOrg, 0, 6));
             }
         } else {
             return RestResult.error(ResultCode.MYSTERIOUS_ERROR, "当前用户所属机关不存在");
@@ -315,7 +317,7 @@ public class BizRemListController extends BaseController implements ServletConte
             resultMap.put("entname", tsAbnList.getEntname());
             resultMap.put("pripid", tsAbnList.getPripid());
             resultMap.put("abnlistid", abnlistid);
-            resultMap.put("reason", "列入机关与当前用户所属机关不匹配！");
+            resultMap.put("reason", "属地机关与当前用户所属机关不匹配！");
             list.add(resultMap);
             return RestResult.ok(list);
         }