From 0d1521253062c4305aae1788e764604c9c86b6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Fri, 31 Mar 2023 15:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ent/SysEnterpriseMapper.xml     | 4 +---
 .../java/com/rzyc/controller/ent/PcCompanyController.java     | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
index c4f8808..49f059b 100644
--- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
@@ -1317,9 +1317,7 @@
         left join SysOrg so on se.community_code = so.OrgCode
     WHERE se.State='启用'
       AND se.`EntName` != '' AND se.EntName IS NOT NULL
-      AND (se.`OrgCode` = #{areaCode}
-       OR se.`street_code` = #{areaCode}
-       OR se.`community_code` = #{areaCode})
+      AND FIND_IN_SET(#{areaCode},se.area_path)
   </select>
 
 
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
index d321c0e..46f3cf5 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
@@ -662,7 +662,6 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
                 return singleResult;
             }
 
-
             getEntAreaCode(sysEnterpriseDo.getAreaCode(),sysEnterprise);
 
             sysEnterprise.setCreatedon(new Date());