diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
index 5ce63f39..70bc7a5f 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java
@@ -185,11 +185,21 @@ public class CoreCodeGenController {
 	@ResponseBody
 	public JsonResult<List<Entity>> getTable(TableSearchQuery tableSearchQuery) {
 		List<Entity> list = codeGenService.getAllEntityInfo();
-		List<Entity> result = list.stream().filter(
-				item -> (StrUtil.isNotBlank(tableSearchQuery.getName()) && item.getName().contains(tableSearchQuery.getName()))
-					 || (StrUtil.isNotBlank(tableSearchQuery.getTableName()) && item.getTableName().contains(tableSearchQuery.getTableName())))
+		list = list.stream().filter(
+				item -> {
+					if (StrUtil.isNotBlank(tableSearchQuery.getName()) && item.getName().contains(tableSearchQuery.getName())) {
+						return true;
+					}
+					if (StrUtil.isNotBlank(tableSearchQuery.getTableName()) && item.getTableName().contains(tableSearchQuery.getTableName())) {
+						return true;
+					}
+					if (StrUtil.isAllBlank(tableSearchQuery.getTableName(), tableSearchQuery.getName())) {
+						return true;
+					}
+					return false;
+				})
 				.collect(Collectors.toList());
-		return JsonResult.success(result);
+		return JsonResult.success(list);
 	}
 
 	@PostMapping(MODEL + "/tableDetail.json")