From 03bddb17e8c1fa4022cc26259e26d7de4b5cb091 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Mon, 23 Sep 2024 19:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86BpmOASalaryControlle?=
 =?UTF-8?q?r=E4=B8=AD=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B9=B6=E5=9C=A8?=
 =?UTF-8?q?BpmOASalaryRespVO=E4=B8=AD=E6=96=B0=E5=A2=9E=E4=BA=86factoryId?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/oa/BpmOASalaryController.java       | 24 +++++++++++++++----
 .../admin/oa/vo/salary/BpmOASalaryRespVO.java |  3 +++
 2 files changed, 23 insertions(+), 4 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 d89a8cd2..c96b82b8 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
@@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.naming.spi.ObjectFactory;
 import javax.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -55,9 +56,18 @@ public class BpmOASalaryController {
     public CommonResult<BpmOASalaryRespVO> getSalary(@RequestParam("id") Long id) {
 
         BpmOASalaryDO salary = salaryService.getSalary(id);
+        if (salary == null) {
+            return success(new BpmOASalaryRespVO());
+        }
 
-        return success(BpmOASalaryConvert.INSTANCE.convert(salary)
-                .setCompanyName(getDept(salary.getCompanyDeptId()).getName()));
+        // 获取部门详情
+        DeptRespDTO dto = getDept(salary.getCompanyDeptId());
+
+        BpmOASalaryRespVO respVO = BpmOASalaryConvert.INSTANCE.convert(salary)
+                .setCompanyName(dto.getName())
+                .setFactoryId(dto.getFactoryId());
+
+        return success(respVO);
     }
 
     @GetMapping("/getByProcessInstanceId")
@@ -67,8 +77,14 @@ public class BpmOASalaryController {
 
         BpmOASalaryDO salary = salaryService.getByProcessInstanceId(processInstanceId);
 
-        return success(BpmOASalaryConvert.INSTANCE.convert(salary)
-                .setCompanyName(getDept(salary.getCompanyDeptId()).getName()));
+        // 获取部门详情
+        DeptRespDTO dto = getDept(salary.getCompanyDeptId());
+
+        BpmOASalaryRespVO respVO = BpmOASalaryConvert.INSTANCE.convert(salary)
+                .setCompanyName(dto.getName())
+                .setFactoryId(dto.getFactoryId());
+
+        return success(respVO);
     }
 
     /**
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java
index 5e73265f..c46e3add 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java
@@ -33,6 +33,9 @@ public class BpmOASalaryRespVO extends BpmOABaseRespVO {
     @Schema(description = "付款公司名称")
     private String companyName;
 
+    @Schema(description = "付款工厂")
+    private Long FactoryId;
+
     @Schema(description = "付款总额")
     private BigDecimal paymentTotal;