diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java index 69f44421..eb87bd44 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java @@ -458,9 +458,11 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl infos){ for (XzdContractDetailsVo info : infos) { //部门名称 - SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getDeptId()); - if (sysDeptVo != null){ - info.setDeptName(sysDeptVo.getDeptName()); + if (info.getDeptId() != null) { + SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getDeptId()); + if (sysDeptVo != null) { + info.setDeptName(sysDeptVo.getDeptName()); + } } //项目名称 if (info.getProject() != null) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java index ade53511..402b50ce 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java @@ -202,7 +202,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl