From e90a991b74e9b6c5169b49a1dca2478b0bca2f25 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 23 六月 2025 14:27:58 +0800 Subject: [PATCH] 涉密网解析工控操作 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/FullHierarchyTraceService.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/FullHierarchyTraceService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/FullHierarchyTraceService.java index 38ca508..43d8920 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/FullHierarchyTraceService.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/FullHierarchyTraceService.java @@ -6,6 +6,7 @@ import org.jeecg.modules.dnc.entity.*; import org.jeecg.modules.dnc.mapper.*; import org.jeecg.modules.dnc.service.IPermissionStreamNewService; +import org.jeecg.modules.system.entity.MdcProduction; import org.jeecg.modules.system.service.IMdcProductionService; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -225,7 +226,10 @@ .eq("delete_flag",0)); path.forEach(item->{ if (item.getDepartId()!=null){ - item.setDepartId(mdcProductionService.getById(item.getDepartId()).getOrgCode()); + MdcProduction mdcProduction=mdcProductionService.getById(item.getDepartId()); + if(mdcProduction!=null){ + item.setDepartId(item.getDepartId()); + } } if (item.getUserId()!=null){ item.setUserId(sysUserService.getById(item.getUserId()).getUsername()); -- Gitblit v1.9.3