无关风月
7 天以前 53d014edd19f57125c355abe71ec5b478500e610
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);