From 21d513317165c0029022d72938f7ef7a9ec985fc Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Mon, 23 Sep 2024 17:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EfactoryId=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=9C=A8=E5=88=9B=E5=BB=BA=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E7=94=B3=E8=AF=B7=E6=97=B6=E5=85=B3=E8=81=94=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/controller/admin/oa/BpmOASalaryController.java      | 4 ++++
 .../admin/oa/vo/salary/BpmOASalaryCreateReqVO.java          | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java
index 969e6cad..d89a8cd2 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java
@@ -42,6 +42,10 @@ public class BpmOASalaryController {
     @Operation(summary = "创建请求申请")
     public CommonResult<Long> createSalary(@Valid @RequestBody BpmOASalaryCreateReqVO createReqVO) {
 
+        if (createReqVO.getFactoryId() != null) {
+            DeptRespDTO dto = deptApi.getDeptByFactoryId(createReqVO.getFactoryId()).getCheckedData();
+            createReqVO.setCompanyDeptId(dto.getId());
+        }
         return success(salaryService.createSalary(getLoginUserId(), createReqVO));
     }
 
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java
index d96b67ba..fa597f04 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryCreateReqVO.java
@@ -29,10 +29,12 @@ public class BpmOASalaryCreateReqVO {
     @NotNull(message = "申请原因不能为空")
     private String reason;
 
-    @Schema(description = "付款公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "付款公司不能为空")
+    @Schema(description = "付款公司")
     private Long companyDeptId;
 
+    @Schema(description = "付款工厂编号")
+    private Long factoryId;
+
     @Schema(description = "付款总额", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "付款总额不能为空")
     private BigDecimal paymentTotal;