From b489f15b60b373320f71211ed39aa446e0dbba8d Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 23 May 2024 14:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../whdc/service/impl/OrganizationServiceImpl.java  |  2 +-
 .../java/com/whdc/service/impl/UserServiceImpl.java | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
index 178e7b6..0d05a69 100644
--- a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
@@ -58,7 +58,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
             organization.setUnitDicts(unitDicts);
             String name = organization.getName();
             if (name.contains("市") && name.contains("县")){
-                organization.setAdinfoList(adinfoService.tree(adcd, null));
+                organization.setAdinfoList(adinfoService.tree(adcd, adcd));
             }
         });
 
diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java
index 168ebba..f3dee1b 100644
--- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java
@@ -82,13 +82,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             if (Objects.nonNull(book)){
                 String adcd = book.getAdcd();
                 if (StringUtils.isNotBlank(adcd)) {
-                    out.setAdcd(adcd);
                     if ("00000000000".equals(adcd.substring(4))) { // 市
                         out.setAdlevel(1);
-
+                        out.setAdcd(adcd.replace("00000000000",""));
                     } else if ("000000000".equals(adcd.substring(6))) { // 县
+                        out.setAdcd(adcd.replace("000000000",""));
                         out.setAdlevel(2);
+                    }else{
+                        out.setAdcd(adcd);
                     }
+
                 }
                 out.setName(book.getName());
             }
@@ -194,12 +197,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         BeanUtils.copyProperties(sysUser, out);
         String adcd = addressBook.getAdcd();
         if (StringUtils.isNotBlank(adcd)) {
-            out.setAdcd(adcd);
             if ("00000000000".equals(adcd.substring(4))) { // 市
                 out.setAdlevel(1);
-
+                out.setAdcd(adcd.replace("00000000000",""));
             } else if ("000000000".equals(adcd.substring(6))) { // 县
+                out.setAdcd(adcd.replace("000000000",""));
                 out.setAdlevel(2);
+            }else{
+                out.setAdcd(adcd);
             }
         }