From 9cb8cf8894306ef24e934e5f81b1c08caac5e8ad Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期二, 05 十一月 2024 11:01:18 +0800 Subject: [PATCH] Excel导出优化 --- src/main/java/com/zy/common/web/AuthController.java | 6 +++--- src/main/java/com/zy/asrs/controller/OpenController.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index c718860..6d247c2 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -157,7 +157,8 @@ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡"); break; default: - log.info("鏈煡鐨勫崟鎹被鍨�:{}", docName); + log.info("鏈煡鐨勫崟鎹被鍨�:{}", param); + mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁()); break; } @@ -247,7 +248,8 @@ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡"); break; default: - log.info("鏈煡鐨勫崟鎹被鍨�:{}", docName); + log.info("鏈煡鐨勫崟鎹被鍨�:{}", param); + mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁()); break; } diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java index 7f178c1..9321b26 100644 --- a/src/main/java/com/zy/common/web/AuthController.java +++ b/src/main/java/com/zy/common/web/AuthController.java @@ -140,9 +140,9 @@ resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort"); } else { // 婵�娲荤爜楠岃瘉 - if (!SystemProperties.SYSTEM_ACTIVATION) { - return R.ok(); - } +// if (!SystemProperties.SYSTEM_ACTIVATION) { +// return R.ok(); +// } oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort")); // 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗� user = userService.selectById(getUserId()); -- Gitblit v1.9.1