Merge remote-tracking branch 'origin/master'

xuhy

9 天以前 a8765eb5005943908901c6163f8e5fd2c577079c

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTaskCleanServiceImpl.java

@@ -69,7 +69,10 @@
                    }
                }else{
                    TDept tDept = deptMapper.selectById(sysUser.getDeptId());
                    temp.setDeptName(tDept.getDeptName());
                    if (tDept != null){
                        temp.setDeptName(tDept.getDeptName());

                    }
                }
            }
            TTaskDetail tTaskDetail = tTaskDetails.stream().filter(e -> e.getTaskId().equals(temp.getId())).findFirst().orElse(null);