From 18127822f3cdb4778fb62ba0304bb8372dada516 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 17 十二月 2025 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
index e472c5b..ec7ca40 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -9,9 +9,11 @@
 import com.fzzy.igds.service.DicService;
 import com.fzzy.igds.service.SecCameraService;
 import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,12 +37,38 @@
     private DicService dicService;
     @Resource
     private CoreDeptService coreDeptService;
-
     @Autowired
     private SecCameraService secCameraService;
-
-    @Autowired
+    @Resource
     private ISysUserService userService;
+    @Resource
+    private ISysDeptService iSysDeptService;
+
+    /**
+     * 鏍规嵁搴撳尯缂栫爜鑾峰彇搴撳尯涓嬫墍鏈変粨搴撳垪琛�
+     *
+     * @param id
+     * @return
+     */
+    public SysDept getDeptById(String id) {
+
+        return iSysDeptService.selectDeptById(Long.valueOf(id));
+    }
+
+    /**
+     * 鑾峰彇搴撳尯楦熺灠鍥�
+     * @param deptId
+     * @return
+     */
+    public String getDeptImg(String deptId) {
+
+        String imgPath = "/img/deptImg.jpg";   //榛樿鍥�
+        Dept dept = coreDeptService.getDeptById(deptId);
+        if(null !=  dept && StringUtils.isNotEmpty(dept.getImgPath())){
+            imgPath =  dept.getImgPath();
+        }
+        return imgPath;
+    }
 
     /**
      * 鏍规嵁瀛楀吀绫诲瀷鑾峰彇瀛楀吀鍒楄〃

--
Gitblit v1.9.3