From 58b8ab921ba5b855807872c849705d3f176dffb5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 二月 2025 11:38:59 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java | 4 ++--
src/main/java/com/zy/asrs/controller/OrderDetlLogController.java | 2 +-
src/main/resources/application.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlLogController.java b/src/main/java/com/zy/asrs/controller/OrderDetlLogController.java
index 40425e9..de5de1d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlLogController.java
@@ -66,7 +66,7 @@
@RequestMapping(value = "/orderDetlLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public synchronized R export(@RequestBody JSONObject param){
EntityWrapper<OrderDetlLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
index 1a0a6fe..357a72f 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
@@ -118,8 +118,8 @@
}
@RequestMapping(value = "/wrkMastDetlLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param) {
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ槑缁嗗鍑�")
+ public synchronized R export(@RequestBody JSONObject param) {
EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastDetlLog"));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 22524fb..f2026f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: loc
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.9.1