From d1ebae3f837f69af8d7d8f752ebd7b976b56db2a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期一, 29 一月 2024 09:46:24 +0800
Subject: [PATCH] 获取集团分类根节点前端传null传入后端直接改为空字符串bug修复
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 30e70e8..c818d09 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -4,11 +4,13 @@
import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
+import com.vci.ubcs.resource.bo.FileObjectBO;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
@@ -39,7 +41,7 @@
* @return
*/
@PostMapping("/lazy-list")
- public R<List<LocalLog>> getSystemLogList(@RequestBody LocalLog localLog){
+ public R<List<LocalLogVO>> getSystemLogList(@RequestBody LocalLog localLog){
return R.data(logLocalService.getSystemLogList(localLog.getLogPath()));
}
@@ -60,7 +62,9 @@
if(StringUtils.isBlank(msg)){
msg = "鏈煡閿欒";
}
- ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+ FileObjectBO fileObjectBO = new FileObjectBO();
+ fileObjectBO.setName(msg.getBytes(StandardCharsets.UTF_8).toString());
+ FileDownloadUtil.downloadFileLocal(response, fileObjectBO,true);
}
}
--
Gitblit v1.9.3