1.资料管理Bug

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckCustomerDataServiceImpl.java

@@ -21,16 +21,40 @@ public class SmsCheckCustomerDataServiceImpl extends ServiceImpl<SmsCheckCustome
         date1.setId(data2.getId());
         if (date1.getBusinessContract()!=null && data2.getBusinessContract() != null){
             date1.setBusinessContract(date1.getBusinessContract() + ","+data2.getBusinessContract());
-        }else {
-            date1.setBusinessContract(data2.getBusinessContract());
         }
 
         if (date1.getSmsNumberCertificate() != null && data2.getSmsNumberCertificate() != null){
             date1.setSmsNumberCertificate(date1.getSmsNumberCertificate() + ","+ data2.getSmsNumberCertificate() );
-        }else {
-            date1.setSmsNumberCertificate(data2.getSmsNumberCertificate());
         }
 
+        if (date1.getRecordNotice() != null && data2.getRecordNotice() != null){
+            date1.setRecordNotice(date1.getRecordNotice() + ","+ data2.getRecordNotice() );
+        }
+
+        if (date1.getGroupPriceApproval() != null && data2.getGroupPriceApproval() != null){
+            date1.setGroupPriceApproval(date1.getGroupPriceApproval() + ","+ data2.getGroupPriceApproval() );
+        }
+
+        if (date1.getBusinessLicence() != null && data2.getBusinessLicence() != null){
+            date1.setBusinessLicence(date1.getBusinessLicence() + ","+ data2.getBusinessLicence() );
+        }
+
+        if (date1.getCustomerIntroductionLetter() != null && data2.getCustomerIntroductionLetter() != null){
+            date1.setCustomerIntroductionLetter(date1.getCustomerIntroductionLetter() + ","+ data2.getCustomerIntroductionLetter() );
+        }
+
+
+        if (date1.getHandlerIdNumberCopy() != null && data2.getHandlerIdNumberCopy() != null){
+            date1.setHandlerIdNumberCopy(date1.getHandlerIdNumberCopy() + ","+ data2.getHandlerIdNumberCopy() );
+        }
+
+        if (date1.getCrmScreenshot() != null && data2.getCrmScreenshot() != null){
+            date1.setCrmScreenshot(date1.getCrmScreenshot() + ","+ data2.getCrmScreenshot() );
+        }
+
+        if (date1.getValueAddedLicence() != null && data2.getValueAddedLicence() != null){
+            date1.setValueAddedLicence(date1.getValueAddedLicence() + ","+ data2.getValueAddedLicence() );
+        }
 
         return date1;
     }