外部订单修改

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

@@ -715,7 +715,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         BeanUtils.copyProperties(insOrders, insOrdersEditingVo);
 
         //如果是外部订单才回显这些数据
-        if(insAreaCompanyList.size() > 0 && insOrders.getIsExternal() == 1){
+        if(insAreaCompanyList.size() > 0 && insOrders.getIsExternal() == 1) {
             insAreaCompanyExternalFee = insAreaCompanyExternalFeeService.getById(insAreaCompanyList.get(0).getId());
             insOrdersEditingVo.setSigningTime(insAreaCompanyList.get(0).getSigningTime());
             insOrdersEditingVo.setJqpremium(insAreaCompanyList.get(0).getJqpremium().toString());
@@ -733,40 +733,42 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 //            insOrdersEditingVo.setExternalPolicy(policyByCompanyId);
 
             List<InsAreaCompanyExternalPolicyVo> jqPolictList = new ArrayList<>();
-            if(policyByCompanyId.getJqPolicy() != null && !policyByCompanyId.getJqPolicy().equals("")) {
-                InsAreaCompanyExternalPolicyVo jqPolict = new InsAreaCompanyExternalPolicyVo();
-                jqPolict.setUrl(policyByCompanyId.getJqPolicy());
-                jqPolict.setName(policyByCompanyId.getJqPolicy().replaceAll("/", "_"));
-                jqPolictList.add(jqPolict);
-            }
-            insOrdersEditingVo.setJqPolicyList(jqPolictList);
-
-            List<InsAreaCompanyExternalPolicyVo> syPolictList = new ArrayList<>();
-            if(policyByCompanyId.getSyPolicy() != null && !policyByCompanyId.getSyPolicy().equals("")) {
-                InsAreaCompanyExternalPolicyVo syPolict = new InsAreaCompanyExternalPolicyVo();
-                syPolict.setUrl(policyByCompanyId.getJqPolicy());
-                syPolict.setName(policyByCompanyId.getJqPolicy().replaceAll("/", "_"));
-                syPolictList.add(syPolict);
-            }
-            insOrdersEditingVo.setSyPolicyList(syPolictList);
-
-            List<InsAreaCompanyExternalPolicyVo> noPolictList = new ArrayList<>();
-            if(policyByCompanyId.getNoPolicy() != null && !policyByCompanyId.getNoPolicy().equals("")) {
-                InsAreaCompanyExternalPolicyVo noPolict = new InsAreaCompanyExternalPolicyVo();
-                noPolict.setUrl(policyByCompanyId.getJqPolicy());
-                noPolict.setName(policyByCompanyId.getJqPolicy().replaceAll("/", "_"));
-                noPolictList.add(noPolict);
-            }
-            insOrdersEditingVo.setNoPolicyList(noPolictList);
-
-            List<InsAreaCompanyExternalPolicyVo> jqSignList = new ArrayList<>();
-            if(policyByCompanyId.getJqSign() != null && !policyByCompanyId.getJqSign().equals("")) {
-                InsAreaCompanyExternalPolicyVo jqSign = new InsAreaCompanyExternalPolicyVo();
-                jqSign.setUrl(policyByCompanyId.getJqSign());
-                jqSign.setName(policyByCompanyId.getJqPolicy().replaceAll("/", "_"));
-                jqSignList.add(jqSign);
+            if (policyByCompanyId != null) {
+                if (policyByCompanyId.getJqPolicy() != null && !policyByCompanyId.getJqPolicy().equals("")) {
+                    InsAreaCompanyExternalPolicyVo jqPolict = new InsAreaCompanyExternalPolicyVo();
+                    jqPolict.setUrl(policyByCompanyId.getJqPolicy());
+                    jqPolict.setName(policyByCompanyId.getJqPolicy().replaceAll("/", "_"));
+                    jqPolictList.add(jqPolict);
+                }
+                insOrdersEditingVo.setJqPolicyList(jqPolictList);
+
+                List<InsAreaCompanyExternalPolicyVo> syPolictList = new ArrayList<>();
+                if (policyByCompanyId.getSyPolicy() != null && !policyByCompanyId.getSyPolicy().equals("")) {
+                    InsAreaCompanyExternalPolicyVo syPolict = new InsAreaCompanyExternalPolicyVo();
+                    syPolict.setUrl(policyByCompanyId.getSyPolicy());
+                    syPolict.setName(policyByCompanyId.getSyPolicy().replaceAll("/", "_"));
+                    syPolictList.add(syPolict);
+                }
+                insOrdersEditingVo.setSyPolicyList(syPolictList);
+
+                List<InsAreaCompanyExternalPolicyVo> noPolictList = new ArrayList<>();
+                if (policyByCompanyId.getNoPolicy() != null && !policyByCompanyId.getNoPolicy().equals("")) {
+                    InsAreaCompanyExternalPolicyVo noPolict = new InsAreaCompanyExternalPolicyVo();
+                    noPolict.setUrl(policyByCompanyId.getNoPolicy());
+                    noPolict.setName(policyByCompanyId.getNoPolicy().replaceAll("/", "_"));
+                    noPolictList.add(noPolict);
+                }
+                insOrdersEditingVo.setNoPolicyList(noPolictList);
+
+                List<InsAreaCompanyExternalPolicyVo> jqSignList = new ArrayList<>();
+                if (policyByCompanyId.getJqSign() != null && !policyByCompanyId.getJqSign().equals("")) {
+                    InsAreaCompanyExternalPolicyVo jqSign = new InsAreaCompanyExternalPolicyVo();
+                    jqSign.setUrl(policyByCompanyId.getJqSign());
+                    jqSign.setName(policyByCompanyId.getJqSign().replaceAll("/", "_"));
+                    jqSignList.add(jqSign);
+                }
+                insOrdersEditingVo.setJqSignList(jqSignList);
             }
-            insOrdersEditingVo.setJqSignList(jqSignList);
         }
 
         List<InsAreaCompanyQueryDto> insAreaCompanyQueryDtos = insAreaCompanyService.getByOrderNo(orderNo);