From 99321f4943f4b298909d99c186e8b3f74c7aa514 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 28 Mar 2025 10:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=92=8C=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=9F=A5=E5=87=BA=E5=AD=90=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jeesite/modules/sys/web/CompanyController.java | 1 +
 .../main/java/com/jeesite/modules/sys/web/OfficeController.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
index 2b02a779..e940a0c5 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
@@ -93,6 +93,7 @@ public class CompanyController extends BaseController {
 			company.setParentCode(Company.ROOT_CODE);
 		}
 		if (StringUtils.isNotBlank(company.getViewCode())
+				|| StringUtils.isNotBlank(company.getViewCode_like())
 				|| StringUtils.isNotBlank(company.getCompanyName())
 				|| StringUtils.isNotBlank(company.getFullName())){
 			company.setParentCode(null);
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
index 25293860..1be88092 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
@@ -96,6 +96,7 @@ public class OfficeController extends BaseController {
 			office.setParentCode(Office.ROOT_CODE);
 		}
 		if (StringUtils.isNotBlank(office.getViewCode())
+				|| StringUtils.isNotBlank(office.getViewCode_like())
 				|| StringUtils.isNotBlank(office.getOfficeName())
 				|| StringUtils.isNotBlank(office.getFullName())){
 			office.setParentCode(null);