From 40a898fedb75b44e10f28d9a86f83af62f71355f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 12:54:41 +0800
Subject: [PATCH] 搜索栏优化
---
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index f39f3f5..f7331c4 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -34,13 +34,15 @@
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
+ @RequestParam(required = false, defaultValue = "asc")String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<BasCrnStatus> 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("sts_no", true);
+ }
return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -57,7 +59,7 @@
}
@RequestMapping(value = "/basCrnStatus/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佹坊鍔�")
public R add(BasCrnStatus basCrnStatus) {
basCrnStatus.setModiUser(getUserId());
basCrnStatus.setModiTime(new Date());
@@ -68,7 +70,7 @@
}
@RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
public R update(BasCrnStatus basCrnStatus){
if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
return R.error();
@@ -80,7 +82,7 @@
}
@RequestMapping(value = "/basCrnStatus/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
public R delete(@RequestParam String param){
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
if (Cools.isEmpty(list)){
@@ -93,7 +95,7 @@
}
@RequestMapping(value = "/basCrnStatus/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1