From 035bd551cd55080e71687e79c8f5ea59ff542c7a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 09:51:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index af3c691..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);
@@ -139,6 +141,9 @@
@RequestMapping(value = "/wrkMast/add/pri/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
public R addPri(@RequestBody List<WrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() + 1);
}
@@ -149,6 +154,9 @@
@RequestMapping(value = "/wrkMast/red/pri/auth")
@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