From 5caa8f04d925fb9e2f47324f6395df9d450326db Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Tue, 3 Feb 2026 21:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=AC=E6=8D=A2=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=9C=BA=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java    | 4 ++--
 .../aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java   | 4 ++--
 .../com/chinaweal/aiccs/org/controller/UserController.java  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java
index 7614690..db88ca1 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java
@@ -498,13 +498,13 @@ public class EBaseinfo extends Model<EBaseinfo> {
     private String sareanameJxmx;
 
     /**
-     * 受理机关
+     * 登记机关转换后的机构代码
      */
     @TableField("ACCEPTREGORG")
     private String acceptRegorg;
 
     /**
-     * 受理机关中文
+     * 登记机关转换后的机构中文
      */
     @TableField("ACCEPTREGORG_CN")
     private String acceptregorgCn;
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 c487b17..299060e 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
@@ -1678,8 +1678,8 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl<EBaseinfoMapper, EBase
                 .set(EBaseinfo::getSuporg, afterDeptid)
                 .set(EBaseinfo::getSuporgCn, org.getOrgUnitName())
                 .set(EBaseinfo::getLocaladm, afterDeptid)
-                .set(EBaseinfo::getAcceptRegorg, afterDeptid)
-                .set(EBaseinfo::getAcceptregorgCn, org.getOrgUnitName())
+//                .set(EBaseinfo::getAcceptRegorg, afterDeptid)
+//                .set(EBaseinfo::getAcceptregorgCn, org.getOrgUnitName())
                 .set(EBaseinfo::getRegulatory, afterDeptid)
                 .set(EBaseinfo::getRegulatoryName, org.getOrgUnitName())
                 .eq(EBaseinfo::getPripid, eBaseinfo.getPripid()); // 根据主键更新
diff --git a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
index d6effc0..3c3a36a 100644
--- a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
+++ b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
@@ -697,8 +697,8 @@ public class UserController extends BaseController {
             List<TSBizSpeList> bizSpeLists = bizSpeListService.list(wrapper);
             TSBizSpeList speList = bizSpeLists.get(0);
             EBaseinfo baseinfo = baseinfoService.getOneByPripid(speList.getPripid());
-            if (!orgUnits.getOrgNumber().equals(baseinfo.getRegorg())) {
-                OrgUnits orginfo = aicorgService.queryByOrgNumber(baseinfo.getRegorg());
+            if (!orgUnits.getOrgNumber().equals(baseinfo.getAcceptRegorg())) {
+                OrgUnits orginfo = aicorgService.queryByOrgNumber(baseinfo.getAcceptRegorg());
                 List<AICUser> list = orgUM.findUsersByOrgAndPermission(orginfo.getOrgUnitId(), permission);
                 if (list != null) {
                     list.forEach(each -> each.setPassword(null));
@@ -726,7 +726,7 @@ public class UserController extends BaseController {
         List<AICUser> list2 = new ArrayList<>();
         // 获取不到列入机关行政区划，查登记机关
         EBaseinfo eBaseinfo = baseinfoService.getById(tsAbnList.getPripid());
-        list2 = aicorgService.queryByOrgNumberAndSysMenu(permission, eBaseinfo.getRegorg());
+        list2 = aicorgService.queryByOrgNumberAndSysMenu(permission, eBaseinfo.getAcceptRegorg());
         list.addAll(list2);
         // 还可以选择同监管所且配置了经办权限的人员
         AICUser aicUser = SSOUtil.getUser();