取主订单不限定同一产品

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/ContractOrderRepository.java

@@ -410,14 +410,12 @@ public class ContractOrderRepository {
      * 根据合同号获取订单实体
      *
      * @param bankId
-     * @param prodId
      * @param contractNo
      * @return
      */
-    public ContractOrderEntity getEntityWithContractNo(String bankId, String prodId, String contractNo) {
+    public ContractOrderEntity getEntityWithContractNo(String bankId, String contractNo) {
         QueryWrapper<ContractOrderEntity> qw = new QueryWrapper<>();
         qw.eq("bank_id", bankId);
-        qw.eq("prod_id", prodId);
         qw.eq("contract_no", contractNo);
         return contractOrderMapper.selectOne(qw);
     }

eladmin-system/src/main/java/me/zhengjie/domain/model/ModelSynthesizerDomain.java

@@ -385,7 +385,7 @@ public class ModelSynthesizerDomain {
         }
         // 抵押合同需要补充借款合同中借款人信息
         if (contractOrderEntity.getContractType() == OrderConstant.CONTRACT_TYPE_MORTGAGE || contractOrderEntity.getContractType() == OrderConstant.CONTRACT_TYPE_GUARANTEE) {
-            ContractOrderEntity mainOrder = contractOrderRepository.getEntityWithContractNo(contractOrderEntity.getBankId(), contractOrderEntity.getProdId(), contractOrderEntity.getMainContractNo());
+            ContractOrderEntity mainOrder = contractOrderRepository.getEntityWithContractNo(contractOrderEntity.getBankId(), contractOrderEntity.getMainContractNo());
             if (mainOrder != null) {
                 String jointName = mainOrder.getJointFlag() == OrderConstant.JOINT_FLAG_TRUE ? "，" + mainOrder.getJointName() : "";
                 String obligor = mainOrder.getName() + jointName;