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) 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());