From 3bfe80dbcb5f4ebbe6cc71bd8e3658eaaecfcc1a Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 16 Jan 2023 17:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84=EF=BC=9A?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finpaymentapply/FinPaymentapplyService.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
index 3e82662965..bfb88c522b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
@@ -64,7 +64,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
 import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
@@ -334,7 +333,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         bv.setFormVariables(variables);
         //流程定义id
         bv.setModelId(ProcDefEnum.FINPAYAPPLY.getProDefId());
-        //根据员工sid查询员工的上级岗位
+       /* //根据员工sid查询员工的上级岗位
         ResultBean<String> sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid());
         if (!sysPostVoResultBean.getSuccess()) {
             return rb.setMsg(sysPostVoResultBean.getMsg());
@@ -354,7 +353,16 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             nextNodeUserSids.append(su.getSid()).append(",");
         }
         //符合条件的用户的sid,拼接的字符串
-        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        String nextNodeUserSids_ = nextNodeUserSids.toString();*/
+        List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData();
+        if(sysOrganization == null){
+            return rb.setMsg("当前所在的组织机构不存在");
+        }
+        if(StringUtils.isBlank(sysOrganization.getManagerSid())){
+            return rb.setMsg("当前所在的组织机构未设置主管人员");
+        }
+        String nextNodeUserSids_ = sysOrganization.getManagerSid();
         bv.setNextNodeUserSids(nextNodeUserSids_);
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);