From 2f6502b1ac9e1a979a8e01c9c9763d9c327e522b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 08:52:34 +0800
Subject: [PATCH] 切换环境至dev并优化单据处理逻辑
---
src/main/java/com/zy/system/controller/OperateLogController.java | 3 +++
1 files changed, 3 insertions(+), 0 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..5eaedef 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));
}
--
Gitblit v1.9.1