diff --git a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java index 120c903..1dfae77 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/bridges/controller/BridgeMaintenanceController.java @@ -94,7 +94,7 @@ if (ToolUtil.isNotEmpty(endDate)) { query.le("maintain_time", endDate); } - query.orderBy("ts",false); + if (ToolUtil.isNotEmpty(keyword)) { List personList = bridgeMaintenanceService.getPersonListByName(keyword); List personIds = personList.stream().map(Person::getId).collect(Collectors.toList()); @@ -104,6 +104,7 @@ query.andNew().like("name", keyword).or().in("person_id", personIds); } } + query.orderBy("maintain_time",false); page = bridgeMaintenanceService.selectPage(page, query); List bridgeMaintenanceList = page.getRecords();