From 110a62d579e7ba4d861a73fb4141e9af26e51a6d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 10:22:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 9c9d979..e596706 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,10 +36,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(WrkMast.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){
if (orderByField.endsWith("$")){
orderByField = orderByField.substring(0, orderByField.length()-1);
@@ -64,7 +66,7 @@
}
@RequestMapping(value = "/wrkMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ坊鍔�")
public R add(WrkMast wrkMast) {
wrkMast.setModiUser(getUserId());
wrkMast.setModiTime(new Date());
@@ -75,7 +77,7 @@
}
@RequestMapping(value = "/wrkMast/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
public R update(WrkMast wrkMast){
if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
return R.error();
@@ -87,7 +89,7 @@
}
@RequestMapping(value = "/wrkMast/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
public R delete(@RequestParam String param){
List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
if (Cools.isEmpty(list)){
@@ -100,7 +102,7 @@
}
@RequestMapping(value = "/wrkMast/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
@@ -137,8 +139,11 @@
}
@RequestMapping(value = "/wrkMast/add/pri/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
public R addPri(@RequestBody List<WrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() + 1);
}
@@ -147,8 +152,11 @@
}
@RequestMapping(value = "/wrkMast/red/pri/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
public R redPri(@RequestBody List<WrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() - 1);
}
--
Gitblit v1.9.1