From ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 19 十二月 2025 11:17:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
index 7678b97..5524ca2 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java
@@ -1,6 +1,7 @@
package com.fzzy.sys.controller.file;
import com.fzzy.igds.data.PageResponse;
+import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.file.FileManager;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -23,11 +24,13 @@
*/
@Slf4j
@Controller
-@RequestMapping("basic/file")
+@RequestMapping("file")
public class FileController {
@Resource
private FileManager fileManager;
+ @Resource
+ private CommonManager commonManager;
/**
* 楦熺灠鍥鹃瑙堥〉闈�
@@ -35,15 +38,13 @@
* @return
*/
@RequestMapping("/dept-img")
- public String deptImg(@RequestParam(value = "id", required = true) String id,
+ public String deptImg(@RequestParam(value = "imgPath", required = true) String imgPath,
ModelMap view) {
- if(StringUtils.isNotEmpty(id)){
- String imgPath = fileManager.getDeptFile(id);;
- view.put("imgPath", imgPath);
- }
+ imgPath = commonManager.isImgExit(imgPath, "dept");
+ view.put("imgPath", imgPath);
- return "web/common/preview-img";
+ return "common/preview-img";
}
--
Gitblit v1.9.3