From aefe63fd01aebb295cf37bc63f77c15cf655ddd0 Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Thu, 1 Jan 2026 20:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=B9=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=AE=80=E7=A7=B0=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TSWorkNoServiceImpl.java     | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java
index 784bff7..3b69858 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/inspect/service/impl/TSWorkNoServiceImpl.java
@@ -389,20 +389,24 @@ public class TSWorkNoServiceImpl extends BaseServiceImpl<TSWorkNoMapper, TSWorkN
 //        if (orgCode.equals("440101")) {
 //            return "穗";
 //        }
-//        LambdaQueryWrapper<Gzaiccode> lqw = Wrappers.lambdaQuery();
-//        lqw.eq(Gzaiccode::getScountrycode, orgCode);
-//        Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw);
-//        return "穗" + gzaiccode.getSregorgname().substring(3, 4);
-        // 不再维护gzaiccode表
-        Map<String, String> map = Constant.GZ_REGION_CODE_SHORTNAME;
-        String shortName = "穗";
-        for (String code : map.keySet()) {
-            if (code.equals(orgCode) && !map.get(code).equals("穗")) {
-                shortName += map.get(code);
-                break;
-            }
+        LambdaQueryWrapper<Gzaiccode> lqw = Wrappers.lambdaQuery();
+        lqw.eq(Gzaiccode::getScountrycode, orgCode);
+        Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw);
+        if (gzaiccode == null) {
+            return "蒙";
+        } else {
+            return gzaiccode.getShortname();
         }
-        return shortName;
+        // 不再维护gzaiccode表
+//        Map<String, String> map = Constant.GZ_REGION_CODE_SHORTNAME;
+//        String shortName = "穗";
+//        for (String code : map.keySet()) {
+//            if (code.equals(orgCode) && !map.get(code).equals("穗")) {
+//                shortName += map.get(code);
+//                break;
+//            }
+//        }
+//        return shortName;
     }
 
     @Override