Merge branch 'master' into test

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -10,10 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.components.OrderComponents;
 import com.ydtech.constants.InsuranceEnum;
-import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.insurance.NatureOfVehicleUse;
-import com.ydtech.constants.enums.dict.insurance.OutOfBusinessVehicleUse;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -437,10 +435,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersExcel.setInsureIdentifyNumber(insure.getIdentifyNumber());
 
             //非车
-            List<DrivingInsuranceDto> drivingInsuranceDtos = insOrdersExcel.getCrossInsurance().toJavaList(DrivingInsuranceDto.class);
-            if (!drivingInsuranceDtos.isEmpty()) {
-                String policyNumber = drivingInsuranceDtos.get(0).getPolicyNumber();
-                insOrdersExcel.setJyPolicyno(policyNumber);
+            if (!ObjectUtils.isEmpty(insOrdersExcel.getCrossInsurance())) {
+                List<DrivingInsuranceDto> drivingInsuranceDtos = insOrdersExcel.getCrossInsurance().toJavaList(DrivingInsuranceDto.class);
+                if (!drivingInsuranceDtos.isEmpty()) {
+                    String policyNumber = drivingInsuranceDtos.get(0).getPolicyNumber();
+                    insOrdersExcel.setJyPolicyno(policyNumber);
+                }
             }
 
             // 设置险种信息

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -357,7 +357,7 @@
         b.jqpremium,
         b.jqpolicyno,
         b.sypremium,
-        b.sypolicyno
+        b.sypolicyno,
         b.jypremium,
         b.taxamount,
         b.jq_start_date,