代码生成增加搜索条件查询;

beetlsql3-dev
Mlxa0324 2 years ago
parent e19bc800d6
commit 26cc8e9680

@ -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")

Loading…
Cancel
Save