From 579d587360c46d3d7c79288420cf85f0cf439d85 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 3 Apr 2023 11:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java        |  6 +++---
 .../biz/crmcustomertemp/CrmCustomerTempService.java    | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 36946a3c5d..156b409da8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -5168,7 +5168,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //中介人1返利总金额
             busSalesOrderFL.setFlPrice(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(quantity)).toString());
             //中介人1户名
-            busSalesOrderFL.setHm(busSalesOrderSubmit.getDistributorUnit());
+            busSalesOrderFL.setHm(busSalesOrderSubmit.getDistributorName());
             //中介人1手机号
             busSalesOrderFL.setSjh(busSalesOrderSubmit.getDistributorMobile());
             //中介人1信息
@@ -5183,7 +5183,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //中介人2返利总金额
             busSalesOrderFL.setFlPrice(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(quantity)).toString());
             //中介人2户名
-            busSalesOrderFL.setHm(busSalesOrderSubmit.getDistributorUnitTwo());
+            busSalesOrderFL.setHm(busSalesOrderSubmit.getDistributorNameTwo());
             //中介人2手机号
             busSalesOrderFL.setSjh(busSalesOrderSubmit.getDistributorMobileTwo());
             //中介人2信息
@@ -5260,7 +5260,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //生成出门证文件名
         String pdfName = "销售订单审批_" + dateStr + seconds + ".pdf";
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
-        return rb.success().setData("/template/" + dateStr + "/" + pdfName);
+        return rb.success().setData("template/" + dateStr + "/" + pdfName);
     }
 
     /*public static String image2Base64(String imgUrl) {
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 367f28d61c..a8c3b5bd59 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -226,12 +226,14 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             String staffName = sysStaffinfoFeign.fetchBySid(staffSid).getData().getName();
             record.setStaffName(staffName);
             List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
-            StringBuilder deptName = new StringBuilder();
             for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
-                String orgName = sysStaffOrgVo.getOrgName();
-                deptName.append(orgName).append(" ");
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
+                String psid = sysOrganizationVo.getPsid();
+                if (psid.equals(createOrgSid)){
+                    String orgName = sysStaffOrgVo.getOrgName();
+                    record.setDeptName(orgName);
+                }
             }
-            record.setDeptName(deptName.toString());
         }
         PagerVo<CrmCustomerTempVo> p = PagerUtil.pageToVo(pagging, null);
         return p;