Commit 310fd12f authored by liqin's avatar liqin 💬

bug fixed

parent d1366fa9
...@@ -76,10 +76,13 @@ public class MenuController extends BaseController { ...@@ -76,10 +76,13 @@ public class MenuController extends BaseController {
public ResponseEntity<Page<Menu>> queryUserList(String name, String url) { public ResponseEntity<Page<Menu>> queryUserList(String name, String url) {
try { try {
QueryWrapper<Menu> ew = new QueryWrapper<>(); QueryWrapper<Menu> ew = new QueryWrapper<>();
ew.like("menu_name", name) if (StringUtils.isNotBlank(name)) {
.like("menu_url", url) ew.like("menu_name", name);
.eq("is_deleted", 0) }
.orderByAsc("sort"); if (StringUtils.isNotBlank(url)) {
ew.like("menu_url", url);
}
ew.eq("is_deleted", 0).orderByAsc("sort");
Page<Menu> page = getPage(); Page<Menu> page = getPage();
Page<Menu> employeePage = menuService.page(page, ew); Page<Menu> employeePage = menuService.page(page, ew);
return ResponseEntity.ok(employeePage); return ResponseEntity.ok(employeePage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment