From 15abc06bb798be53f1ab3e0da726327c6f4070d3 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 30 Jan 2024 15:55:37 +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

---
 .../CrmCustomerTempService.java               | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

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 c96e6e2153..7f91760202 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
@@ -1322,16 +1322,31 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     public ResultBean<String> updateTemp(CustomerSecondSalesDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         AppCrmCustomerTempDto appCrmCustomerTempDto = new AppCrmCustomerTempDto();
-        appCrmCustomerTempDto.setSid(dto.getCustomerSid());
-        appCrmCustomerTempDto.setName(dto.getCustomerName());
-        appCrmCustomerTempDto.setMobile(dto.getMobile());
-        appCrmCustomerTempDto.setCertificateTypeKey(dto.getCertificateTypeKey());
-        appCrmCustomerTempDto.setCertificateType(dto.getCertificateType());
-        appCrmCustomerTempDto.setCustomerType(dto.getCustomerType());
-        appCrmCustomerTempDto.setCustomerTypeKey(dto.getCustomerTypeKey());
-        appCrmCustomerTempDto.setIDNumber(dto.getIDNumber());
-        appCrmCustomerTempDto.setEndDate(dto.getEndDate());
-        appCrmCustomerTempDto.setCertificateAddress(dto.getCertificateAddress());
+        if(StringUtils.isNotBlank(dto.getCustomerSid())){
+            CrmCustomerTemp customerTemp = fetchBySid(dto.getCustomerSid());
+            BeanUtils.copyProperties(customerTemp,appCrmCustomerTempDto);
+            appCrmCustomerTempDto.setSid(dto.getCustomerSid());
+            appCrmCustomerTempDto.setCertificateTypeKey(dto.getCertificateTypeKey());
+            appCrmCustomerTempDto.setCertificateType(dto.getCertificateType());
+            appCrmCustomerTempDto.setIDNumber(dto.getIDNumber());
+            appCrmCustomerTempDto.setEndDate(dto.getEndDate());
+            appCrmCustomerTempDto.setCertificateAddress(dto.getCertificateAddress());
+            appCrmCustomerTempDto.setUserSid(dto.getUserSid());
+        }else{
+            appCrmCustomerTempDto.setSid(dto.getCustomerSid());
+            appCrmCustomerTempDto.setName(dto.getCustomerName());
+            appCrmCustomerTempDto.setMobile(dto.getMobile());
+            appCrmCustomerTempDto.setCertificateTypeKey(dto.getCertificateTypeKey());
+            appCrmCustomerTempDto.setCertificateType(dto.getCertificateType());
+            appCrmCustomerTempDto.setCustomerType(dto.getCustomerType());
+            appCrmCustomerTempDto.setCustomerTypeKey(dto.getCustomerTypeKey());
+            appCrmCustomerTempDto.setIDNumber(dto.getIDNumber());
+            appCrmCustomerTempDto.setEndDate(dto.getEndDate());
+            appCrmCustomerTempDto.setCertificateAddress(dto.getCertificateAddress());
+            appCrmCustomerTempDto.setUserSid(dto.getUserSid());
+            appCrmCustomerTempDto.setOrgPath(dto.getOrgPath());
+        }
+
         ResultBean<String> resultBean = saveOrUpdateAppCustomerTemp(appCrmCustomerTempDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());