From 47bba68b54b9818510ac6a39ee2a19cdba4ca71e Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 27 Sep 2023 18:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java                 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index f8b345174a..c381497cd8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -387,6 +387,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
             busDeliveredApply.setCreateBySid(dto.getUserSid());
+            BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractNo());
+            if(busSalesOrder != null){
+                busDeliveredApply.setStaffDeptName(busSalesOrder.getOrgName());
+                busDeliveredApply.setStaffDeptSid(busSalesOrder.getOrgSid());
+            }
             String useOrgSid = "";
             if (StringUtils.isNotBlank(dto.getOrgPath())) {
                 useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@@ -2165,6 +2170,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             busDeliveredApply.setStaffUserSid(userSid);
             busDeliveredApply.setStaffName(userVoResultBean.getData().getName());
             busDeliveredApply.setOrgSidPath(orgSidPath);
+            BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractId());
+            if(busSalesOrder != null){
+                busDeliveredApply.setStaffDeptName(busSalesOrder.getOrgName());
+                busDeliveredApply.setStaffDeptSid(busSalesOrder.getOrgSid());
+            }
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgFeign.getOrgSidByPath(orgPath).getData()).getData();
             //出库申请单号
             String billNo = "";
@@ -2342,6 +2352,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 dto.setPaymentMethodKey(busDeliveredApply.getPaymentMethodKey());
             }
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
+            BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractId());
+            if(busSalesOrder != null){
+                busDeliveredApply.setStaffDeptName(busSalesOrder.getOrgName());
+                busDeliveredApply.setStaffDeptSid(busSalesOrder.getOrgSid());
+            }
             //根据合同编号查询销售订单的信息
             ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);
             if (!resultBean.getSuccess()) {