|
|
@ -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); |
|
|
|