修复bug

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -4703,6 +4703,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     //递归获取所有上级部门字符串，格式："上级部门/上级部门/部门"
     private String getSupDepartment(Department department) {
+        if (department == null){
+            return "";
+        }
         String depHierarchy = department.getDepartmentName();
         //搜到父部门进行添加
         if (department.getSuperiorId()==null) {
@@ -4715,6 +4718,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     //用于报表展示：递归获取企业微信所有上级部门字符串，格式："上级部门/上级部门/部门"
     private String getWxDepartment(Department department) {
+        if (department == null || department.getCorpwxDeptid() == null){
+            return "";
+        }
         String depHierarchy = department.getCorpwxDeptid()+"";
         //搜到父部门进行添加
         if (department.getCorpwxDeptpid()==null || department.getCorpwxDeptpid()==1) {
@@ -4727,7 +4733,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     //用于导出：递归获取企业微信所有上级部门字符串，格式："上级部门/上级部门/部门"
     private String exportWxDepartment(Department department) {
-        if(department.getCorpwxDeptid() == null){
+        if(department == null || department.getCorpwxDeptid() == null){
             return "";
         }
         String depHierarchy = "$departmentName="+department.getCorpwxDeptid()+"$";

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4090,7 +4090,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
                 Department dept = null;
                 for (Department department : departments) {
-                    if (map.containsKey(departmentId) && department.getDepartmentId().toString().equals(map.get("departmentId").toString())){
+                    if (map.containsKey("departmentId") && department.getDepartmentId().toString().equals(map.get("departmentId").toString())){
                         dept = department;
                         break;
                     }