修改问题

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -819,9 +819,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid());
                 if(pathSidByUserSid.getData()!=null){
                     ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData());
-                    ogrName=sysOrganizationVoResultBean.getData().getName();
+                    if(sysOrganizationVoResultBean.getData() != null){
+                        ogrName=sysOrganizationVoResultBean.getData().getName();
+                        flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());
+                    }else{
+                        flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
+                    }
                 }
-                flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());
+
             }
             hisTaskList.add(flowTask);
         }
@@ -966,9 +971,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid());
                 if(pathSidByUserSid.getData()!=null){
                     ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData());
-                    ogrName=sysOrganizationVoResultBean.getData().getName();
+                    if(sysOrganizationVoResultBean.getData() != null){
+                        ogrName=sysOrganizationVoResultBean.getData().getName();
+                        flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());
+                    }else{
+                        flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
+                    }
+
                 }
-                flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());
+
             }