BUG修复

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

@@ -4229,24 +4229,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     private String getSupDepartment(Department department) {
         String depHierarchy = department.getDepartmentName();
         //搜到父部门进行添加
-        if (department.getSuperiorId()!=null) {
+        if (department.getSuperiorId()==null) {
+            return depHierarchy;
+        } else {
             Department supDep = departmentMapper.selectById(department.getSuperiorId());
-            depHierarchy = supDep.getDepartmentName() +  "/" + depHierarchy;
-            getSupDepartment(supDep);
+            return getSupDepartment(supDep) + "/" + depHierarchy;
         }
-        return depHierarchy;
     }
 
     //递归获取企业微信所有上级部门字符串，格式："上级部门/上级部门/部门"
     private String getWxDepartment(Department department) {
         String depHierarchy = "$departmentName="+department.getCorpwxDeptid()+"$";
         //搜到父部门进行添加
-        if (department.getCorpwxDeptpid()!=null) {
-            Department supDep = departmentMapper.selectById(department.getCorpwxDeptpid());
-            depHierarchy = "$departmentName="+supDep.getCorpwxDeptid()+"$" +  "/" + depHierarchy;
-            getWxDepartment(supDep);
+        if (department.getCorpwxDeptpid()==null || department.getCorpwxDeptpid()==1) {
+            return depHierarchy;
+        }else{
+            Department supDep = departmentMapper.selectOne(new QueryWrapper<Department>().eq("corpwx_deptid",department.getCorpwxDeptpid()));
+            return getWxDepartment(supDep) + "/" + depHierarchy;
         }
-        return depHierarchy;
     }
 
     @Override