From 2b706d5dcb8e4b8f3079c4fcea1f317b8cadbe09 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Thu, 19 Sep 2024 11:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BAoa=E8=96=AA=E8=B5=84=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E5=B2=97=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在处理oa薪资付款流程时，添加逻辑以判断和设置公司部门标志，确保流程实例数据的一致性和完整性。
---
 .../bpm/service/task/BpmTaskServiceImpl.java      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
index bbfc321e..9f25b6c4 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
 import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEntryDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASalaryDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASealDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
@@ -27,6 +28,7 @@ import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOAEntryService;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOASalaryService;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOASealService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -112,6 +114,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
     @Resource
     private BpmOASealService bpmOASealService;
 
+    @Resource
+    private BpmOASalaryService bpmOASalaryService;
+
     @Override
     public PageResult<BpmTaskCCPageItemRespVO> getCCTaskPage(Long userId, BpmTaskDonePageReqVO pageVO) {
         // 查询被抄送的Task
@@ -544,6 +549,16 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             }
         }
 
+        // 判断 薪资付款流程时
+        if (instance.getProcessDefinitionId().contains("oa_salary")) {
+            BpmOASalaryDO salaryDO = bpmOASalaryService.getByProcessInstanceId(instance.getProcessInstanceId());
+            if (salaryDO != null) {
+
+                DeptRespDTO dto = deptApi.getDept(salaryDO.getCompanyDeptId()).getCheckedData();
+                paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂idflag
+            }
+        }
+
         ArrayList<Long> list = new ArrayList<>(postIds);
         // 只获配置的首个岗位
         Long postId = list.get(0);