From 63676447b730800bc7ba3df060bf867713db98f4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 12:55:02 +0800
Subject: [PATCH] 关闭与erp的对接
---
src/main/java/com/zy/asrs/controller/ApiLogController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 1ba16f5..fe899f3 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -38,11 +38,15 @@
@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){
EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ allLike(ApiLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -70,7 +74,7 @@
@ManagerAuth
public R update(ApiLog apiLog){
if (Cools.isEmpty(apiLog) || null==apiLog.getId()){
- return R.error();
+ return R.error("璇锋眰鍙傛暟涓虹┖");
}
apiLogService.updateById(apiLog);
return R.ok();
--
Gitblit v1.9.1