From 53d014edd19f57125c355abe71ec5b478500e610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 09:57:40 +0800
Subject: [PATCH] 保洁巡检所有代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEarlyWarningServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEarlyWarningServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEarlyWarningServiceImpl.java
index 0e2fb33..7b085ad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEarlyWarningServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEarlyWarningServiceImpl.java
@@ -146,15 +146,21 @@
taskWarningVO.setPatrolInspectorName(sysUser.getNickName());
if (sysUser.getDeptType() == 1){
TProjectDept tProjectDept = projectDeptMapper.selectById(sysUser.getDeptId());
- if (!tProjectDept.getParentId().equals("0")){
+ if (tProjectDept!=null&&!tProjectDept.getParentId().equals("0")){
TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
- taskWarningVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ if (tProjectDept1!=null){
+ taskWarningVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }
}else{
- taskWarningVO.setDeptName(tProjectDept.getProjectName());
+ if (tProjectDept!=null){
+ taskWarningVO.setDeptName(tProjectDept.getProjectName());
+ }
}
}else{
TDept tDept = deptMapper.selectById(sysUser.getDeptId());
- taskWarningVO.setDeptName(tDept.getDeptName());
+ if (tDept!=null){
+ taskWarningVO.setDeptName(tDept.getDeptName());
+ }
}
}
res.add(taskWarningVO);
--
Gitblit v1.7.1