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/WrkMastLogController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index ae40055..6bad9f4 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.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.WrkMastLog;
-import com.zy.asrs.service.WrkMastLogService;
-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.WrkMastLog;
+import com.zy.asrs.service.WrkMastLogService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,10 +39,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<WrkMastLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){
if (orderByField.endsWith("$")){
orderByField = orderByField.substring(0, orderByField.length()-1);
@@ -67,14 +69,14 @@
}
@RequestMapping(value = "/wrkMastLog/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
public R add(WrkMastLog wrkMastLog) {
wrkMastLogService.insert(wrkMastLog);
return R.ok();
}
@RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
public R update(WrkMastLog wrkMastLog){
if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
return R.error();
@@ -84,7 +86,7 @@
}
@RequestMapping(value = "/wrkMastLog/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
public R delete(@RequestParam String param){
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
if (Cools.isEmpty(list)){
@@ -97,7 +99,7 @@
}
@RequestMapping(value = "/wrkMastLog/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1