From f5998ea2ac83a34bc466b0c2241e3c0829cf48c1 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 16 Jan 2023 17:20:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/flowtask/FlowTaskService.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 057cb61181..eab5111820 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/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 pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid()); if(pathSidByUserSid.getData()!=null){ ResultBean 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 pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid()); if(pathSidByUserSid.getData()!=null){ ResultBean 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()); + }