From 70b0de9a973e6da328f21c67d6ce3416c0984ff2 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Apr 2025 13:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=97=B4=E8=B0=83=E8=B4=A6?= =?UTF-8?q?=E5=BD=93=E5=8F=91=E8=B5=B7=E6=96=B9=E6=9C=80=E5=90=8E=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=8E=AF=E8=8A=82=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=B7=B3?= =?UTF-8?q?=E5=BA=94=E5=AF=B9=E6=96=B9=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 26 +++++++++++++++++-- .../FinPaymentrecordService.java | 2 +- .../anrui/flowable/biz/flow2/FlowService.java | 14 +++++++++- .../biz/flowtask/FlowTaskService.java | 1 + 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 984228c244..522acf99c0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -495,11 +495,33 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); Map formVariables = bv.getFormVariables(); if (formVariables == null) { - map.put("isAdj", i); - bv.setFormVariables(map); + formVariables = new HashMap<>(); + formVariables.put("isAdj", i); + String ydfOrgSid = ""; + if("调入".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallOutOrgSid(); + }else if("调出".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallInOrgSid(); + } + SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(ydfOrgSid).getData(); + String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath(); + formVariables.put("ydfOrgPath",orgSidPathDRBM); + formVariables.put("service","公司间调账"); + } else { formVariables.put("isAdj", i); + String ydfOrgSid = ""; + if("调入".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallOutOrgSid(); + }else if("调出".equals(baseAccadjApply.getAccadjTypeValue())){ + ydfOrgSid = baseAccadjApply.getCallInOrgSid(); + } + SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(ydfOrgSid).getData(); + String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath(); + formVariables.put("ydfOrgPath",orgSidPathDRBM); + formVariables.put("service","公司间调账"); } + bv.setFormVariables(formVariables); if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 295dc2c074..a787bee9df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -866,7 +866,7 @@ public class FinPaymentrecordService extends MybatisBaseService { nextUserSid = stringResultBean.getData(); } } - } else if (StringUtils.isBlank(nextUserSid)) { + } else if("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))){ + if (StringUtils.isBlank(nextUserSid)) { + bv.setOrgSidPath(ydfOrgPath); + ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); + if (!stringResultBean.getSuccess()) { + //下一环节用户为空的情况 + nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); + adminContains = true; + } else { + nextUserSid = stringResultBean.getData(); + } + } + }else if (StringUtils.isBlank(nextUserSid)) { ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); if (!stringResultBean.getSuccess()) { //下一环节用户为空的情况 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 06863c772a..f027afe042 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 @@ -944,6 +944,7 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + ASSIGNEE_List.removeAll(Collections.singleton(null)); if(!ASSIGNEE_List.isEmpty()){ StringBuilder userName = new StringBuilder(); for (String assignee : ASSIGNEE_List) {