From 7a534f9026665c5b0c0538ba91027d877fee3030 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 20 Oct 2021 17:56:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041134=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E6=90=9C=E7=B4=A2--=E8=BE=93=E5=85=A5%=E5=90=8E?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/SysDepartController.java | 10 +++++-----
 .../system/service/impl/SysDepartServiceImpl.java      |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
index 6d030a4d..12dc96b6 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
@@ -330,11 +330,11 @@ public class SysDepartController {
 			departIds = user.getDepartIds();
 		}
 		List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds);
-		if (treeList == null || treeList.size() == 0) {
-			result.setSuccess(false);
-			result.setMessage("未查询匹配数据！");
-			return result;
-		}
+		//if (treeList == null || treeList.size() == 0) {
+		//	result.setSuccess(false);
+		//	result.setMessage("未查询匹配数据！");
+		//	return result;
+		//}
 		result.setResult(treeList);
 		return result;
 	}
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java
index 58368268..58cb1559 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java
@@ -4,6 +4,9 @@ import java.util.*;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.system.vo.SysDepartTreeModel;
+import com.jero.common.util.oConvertUtils;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.locale.LocaleConvertUtils;
 import org.apache.commons.lang.StringUtils;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
@@ -291,6 +294,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			}
 			query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
 		}
+		keyWord = oConvertUtils.replaceAllPercent(keyWord);
 		query.like(SysDepart::getDepartName, keyWord);
 		//update-begin--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索回显优化--------------------
 		SysDepartTreeModel model = new SysDepartTreeModel();
@@ -307,7 +311,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			}
 			return newList;
 		}
-		return null;
+		return newList;
 	}
 
 	/**