From 511bf33914cceaf6774244643a8467a692126100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Mon, 8 Dec 2025 19:36:59 +0800
Subject: [PATCH] =?UTF-8?q?12-05-=E4=BA=8B=E6=95=85=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BA=8B=E6=95=85=E4=B8=8A=E6=8A=A5=E3=80=81=E4=BA=8B=E6=95=85?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5-=E4=BF=AE=E6=94=B9-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HseSafetySgdcServiceImpl.java        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java
index e1b2270a..3090167e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java
@@ -26,7 +26,6 @@ import org.dromara.system.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -207,11 +206,11 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
      * 装填数据
      */
     public void setValue(List<HseSafetySgdcVo> vos){
-        List<SysDeptVo> deptVos = new ArrayList<>();
-        if (!vos.isEmpty()) {
-            //获取部门
-            deptVos = deptService.querListDept();
-        }
+//        List<SysDeptVo> deptVos = new ArrayList<>();
+//        if (!vos.isEmpty()) {
+//            //获取部门
+//            deptVos = deptService.querListDept();
+//        }
         for (HseSafetySgdcVo vo : vos) {
             //事故关联项目id
             HseSafetySgsb hseSafetySgsbVo = baseMapper.getSgsb(vo.getSgId());
@@ -224,10 +223,14 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
             }
             //部门名称
             if (vo.getZrbm() != null){
-                for (SysDeptVo deptVo : deptVos) {
-                    if (vo.getZrbm().equals(deptVo.getDeptId())){
-                        vo.setBmmc(deptVo.getDeptName());
-                    }
+//                for (SysDeptVo deptVo : deptVos) {
+//                    if (vo.getZrbm().equals(deptVo.getDeptId())){
+//                        vo.setBmmc(deptVo.getDeptName());
+//                    }
+//                }
+                SysDeptVo sysDeptVo = deptService.selectDeptById(vo.getZrbm());
+                if (sysDeptVo != null){
+                    vo.setBmmc(sysDeptVo.getDeptName());
                 }
             }
             //主要负责人