From cfc058769f58c2af68e16b14159f74f991a9f1b2 Mon Sep 17 00:00:00 2001
From: lroyia <lirh@chinaweal.com.cn>
Date: Fri, 13 Mar 2026 14:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=86=99=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EFalPerInfoServiceImpl.java  | 93 ++++++-------------
 1 file changed, 29 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/EFalPerInfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/EFalPerInfoServiceImpl.java
index c824dee..160a80e 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/EFalPerInfoServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/EFalPerInfoServiceImpl.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
-import com.chinaweal.aiccs.aiccs.dict.entity.CmsDictCode;
 import com.chinaweal.aiccs.aiccs.dict.service.CmsDictCodeService;
 import com.chinaweal.aiccs.aiccs.susnate.dto.EntBaseWithFalPerInfoQueryDTO;
 import com.chinaweal.aiccs.aiccs.susnate.dto.FalPerInfoAddDTO;
@@ -17,8 +16,11 @@ import com.chinaweal.aiccs.aiccs.susnate.entity.EFalPerInfo;
 import com.chinaweal.aiccs.aiccs.susnate.mapper.EFalPerInfoMapper;
 import com.chinaweal.aiccs.aiccs.susnate.service.IEFalPerInfoService;
 import com.chinaweal.aiccs.aiccs.susnate.vo.EntBaseWithFalPerInfoVO;
+import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService;
 import com.chinaweal.aiccs.common.constant.CommonConstants;
 import com.chinaweal.aiccs.common.util.StringUtils;
+import com.chinaweal.aiccs.org.entity.OrgUnits;
+import com.chinaweal.aiccs.org.service.AicorgService;
 import com.chinaweal.aicorg.model.AICUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,9 +38,15 @@ public class EFalPerInfoServiceImpl extends ServiceImpl<EFalPerInfoMapper, EFalP
     @Autowired
     private EBaseinfoService eBaseinfoService;
 
+    @Autowired
+    private TRBaseCodeService trBaseCodeService;
+
     @Autowired
     private CmsDictCodeService cmsDictCodeService;
 
+    @Autowired
+    private AicorgService aicorgService;
+
     @Override
     public EFalPerInfo addFalPerInfo(FalPerInfoAddDTO dto, AICUser curUser) {
         EFalPerInfo entity = new EFalPerInfo();
@@ -58,41 +66,19 @@ public class EFalPerInfoServiceImpl extends ServiceImpl<EFalPerInfoMapper, EFalP
         entity.setSExtFromNode("150000");
 
         // BUG修复：通过 uniscid 或 regno 获取 pripid
-        if (StringUtils.isNotBlank(dto.getUniscid())) {
-            try {
-                EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getUniscid());
-                if (baseinfo != null) {
-                    entity.setPripid(baseinfo.getPripid());
-                }
-            } catch (Exception e) {
-                // 如果根据 uniscid 查询失败，尝试使用 regno
-                if (StringUtils.isNotBlank(dto.getRegno())) {
-                    try {
-                        EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getRegno());
-                        if (baseinfo != null) {
-                            entity.setPripid(baseinfo.getPripid());
-                        }
-                    } catch (Exception ex) {
-                        // 忽略查询异常
-                    }
-                }
-            }
-        } else if (StringUtils.isNotBlank(dto.getRegno())) {
-            try {
-                EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getRegno());
-                if (baseinfo != null) {
-                    entity.setPripid(baseinfo.getPripid());
-                }
-            } catch (Exception e) {
-                // 忽略查询异常
+        if (StringUtils.isBlank(entity.getPripid()) && StringUtils.isNotBlank(dto.getUniscid())) {
+            EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getUniscid());
+            if (baseinfo != null) {
+                entity.setPripid(baseinfo.getPripid());
             }
         }
-
-        // BUG修复：通过 judAuth 获取 judAuthCn（字典表类型为 CA11）
+        // BUG修复：通过 judAuth 获取 judAuthCn
         if (StringUtils.isNotBlank(dto.getJudAuth())) {
-            CmsDictCode dictCode = cmsDictCodeService.getList("CA11", dto.getJudAuth());
-            if (dictCode != null) {
-                entity.setJudAuthCn(dictCode.getLabel());
+            String code = StringUtils.fillZeroSuffix(StringUtils.clearRegionZero(dto.getJudAuth()), 6);
+            OrgUnits one = aicorgService.lambdaQuery().eq(OrgUnits::getOrgNumber, code).eq(OrgUnits::getUnitType, "1")
+                    .eq(OrgUnits::getDeleted, CommonConstants.FALSE_0).last("limit 1").one();
+            if (one != null) {
+                entity.setJudAuthCn(one.getOrgUnitName());
             }
         }
 
@@ -117,41 +103,20 @@ public class EFalPerInfoServiceImpl extends ServiceImpl<EFalPerInfoMapper, EFalP
         entity.setSExtDataTime(LocalDateTime.now());
 
         // BUG修复：通过 uniscid 或 regno 获取 pripid
-        if (StringUtils.isNotBlank(dto.getUniscid())) {
-            try {
-                EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getUniscid());
-                if (baseinfo != null) {
-                    entity.setPripid(baseinfo.getPripid());
-                }
-            } catch (Exception e) {
-                // 如果根据 uniscid 查询失败，尝试使用 regno
-                if (StringUtils.isNotBlank(dto.getRegno())) {
-                    try {
-                        EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getRegno());
-                        if (baseinfo != null) {
-                            entity.setPripid(baseinfo.getPripid());
-                        }
-                    } catch (Exception ex) {
-                        // 忽略查询异常
-                    }
-                }
-            }
-        } else if (StringUtils.isNotBlank(dto.getRegno())) {
-            try {
-                EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getRegno());
-                if (baseinfo != null) {
-                    entity.setPripid(baseinfo.getPripid());
-                }
-            } catch (Exception e) {
-                // 忽略查询异常
+        if (StringUtils.isBlank(entity.getPripid()) && StringUtils.isNotBlank(dto.getUniscid())) {
+            EBaseinfo baseinfo = eBaseinfoService.getEntBaseInfoByCode(dto.getUniscid());
+            if (baseinfo != null) {
+                entity.setPripid(baseinfo.getPripid());
             }
         }
 
-        // BUG修复：通过 judAuth 获取 judAuthCn（字典表类型为 CA11）
+        // BUG修复：通过 judAuth 获取 judAuthCn
         if (StringUtils.isNotBlank(dto.getJudAuth())) {
-            CmsDictCode dictCode = cmsDictCodeService.getList("CA11", dto.getJudAuth());
-            if (dictCode != null) {
-                entity.setJudAuthCn(dictCode.getLabel());
+            String code = StringUtils.fillZeroSuffix(StringUtils.clearRegionZero(dto.getJudAuth()), 6);
+            OrgUnits one = aicorgService.lambdaQuery().eq(OrgUnits::getOrgNumber, code).eq(OrgUnits::getUnitType, "1")
+                    .eq(OrgUnits::getDeleted, CommonConstants.FALSE_0).last("limit 1").one();
+            if (one != null) {
+                entity.setJudAuthCn(one.getOrgUnitName());
             }
         }