From cc3185eaf94050d299cbd9d0c105eb3d1229996a Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 16:10:04 +0800
Subject: [PATCH] 修復
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocInPrintMatController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocInPrintMatController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocInPrintMatController.java
index 5979f2a..625dcb8 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocInPrintMatController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocInPrintMatController.java
@@ -23,7 +23,7 @@
@Autowired
private LocInPrintMatService locInPrintMatService;
- @RequestMapping(value = "/locInPrintMat/{id}/auth")
+ @RequestMapping(value = "/locInPrintMat/{id}/auth/v1")
@ManagerAuth
public R get(@PathVariable("id") String id) {
return R.ok(locInPrintMatService.getById(String.valueOf(id)));
@@ -45,6 +45,8 @@
wrapper.ge(LocInPrintMat::getCreateTime, DateUtils.convert(range[0]));
wrapper.le(LocInPrintMat::getCreateTime, DateUtils.convert(range[1]));
}
+ wrapper.orderBy("status".isEmpty(),true);
+ wrapper.orderBy("create_time".isEmpty(),false);
return R.ok(locInPrintMatService.page(new Page<>(curr, limit), wrapper));
}
@@ -69,7 +71,7 @@
@RequestMapping(value = "/locInPrintMat/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ for (Long id : ids){
locInPrintMatService.removeById(id);
}
return R.ok();
--
Gitblit v1.9.1