From 5701eb6693c654d53f1bba460eb3a417d495b344 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 六月 2025 17:31:53 +0800
Subject: [PATCH] bug修复；下发任务给rcs携带货架码
---
src/main/java/com/zy/system/controller/OperateLogController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index 8399ad4..18de39a 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.common.web.BaseController;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
@@ -33,10 +34,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<OperateLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(OperateLog.class, param.keySet(), wrapper, condition);
wrapper.orderBy("id", false);
return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -58,7 +61,7 @@
@ManagerAuth
public R edit(OperateLog operateLog) {
if (Cools.isEmpty(operateLog)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (null == operateLog.getId()){
operateLogService.insert(operateLog);
@@ -79,7 +82,7 @@
@ManagerAuth
public R update(OperateLog operateLog){
if (Cools.isEmpty(operateLog) || null==operateLog.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
operateLogService.updateById(operateLog);
return R.ok();
@@ -89,7 +92,7 @@
@ManagerAuth
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
operateLogService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
--
Gitblit v1.9.1