Merge branch 'v1.1-dev' of http://192.168.0.200:3000/wanglang/trade-platform into v1.1-dev

trade-service/src/main/java/com/trade/service/thirdparty/sop/service/impl/SOPServiceImpl.java

@@ -78,6 +78,10 @@ public class SOPServiceImpl implements SOPService {
         if (null == json) {
             throw new ServiceException("获取企业风险调查信息失败", HttpStatus.ERROR);
         }
+        if (!json.isSuccess() || null == json.getData()) {
+            log.error("获取企业风险调查信息失败,错误信息：" + json.getMsg());
+            throw new ServiceException("获取企业风险调查信息失败", HttpStatus.ERROR);
+        }
         return JSON.parseObject(json.getData().toString(), SOPRiskInvestigation.class);
     }
 

trade-service/src/main/resources/mapper/trade/salesorder/CustomsDeclarationMapper.xml

@@ -183,10 +183,11 @@
                 LEFT JOIN enterprise f ON b.customer_user_id = f.customer_id
                 LEFT JOIN customs_declaration_file g ON a.bgdhgbh = g.customs_no
         WHERE
-            g.customs_file_id IS NULL
-           OR g.entrust_file_id IS NULL
+            (g.customs_file_id IS NULL
+           OR g.entrust_file_id IS NULL)
             AND a.deleted = 0
     </select>
+
     <select id="queryList4FilingDocBySearch"
             resultType="com.trade.service.trade.filingdoc.vo.CustomsDeclaration4FilingDocVO">
         select