From b1b78ed80b8bc68c31b7c8ab006bda8899b9b0f4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 六月 2020 15:15:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index 3f5c49d..c645c25 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -43,7 +43,11 @@
excludeTrash(param);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("appe_time", false);
+ }
return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -60,14 +64,14 @@
}
@RequestMapping(value = "/wrkDetl/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗘坊鍔�")
public R add(WrkDetl wrkDetl) {
wrkDetlService.insert(wrkDetl);
return R.ok();
}
@RequestMapping(value = "/wrkDetl/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
public R delete(@RequestParam String param){
List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
if (Cools.isEmpty(list)){
@@ -80,7 +84,7 @@
}
@RequestMapping(value = "/wrkDetl/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1