外销跟单分页BUG修复

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractDocumentarySelectDto.java

@@ -17,7 +17,7 @@ public class ContractDocumentarySelectDto extends BaseSelectDto {
     /**
      * 合同ID
      */
-    private Long contractId;
+    private Long purchaseId;
 
     /**
      * 跟单类型

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractDocumentaryServiceImpl.java

@@ -36,7 +36,7 @@ public class ContractDocumentaryServiceImpl extends ServiceImpl<ContractDocument
     @Override
     public Page<ContractDocumentaryVo> getPage(ContractDocumentarySelectDto dto) {
         IWrapper<ContractDocumentary> wrapper = getWrapper();
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getContractId()),"contract_id",dto.getContractId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPurchaseId()),"purchase_id",dto.getPurchaseId());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getDocumentaryType()),"documentary_type",dto.getDocumentaryType());
         wrapper.orderByDesc("cd", ContractDocumentary::getId);
         Page<ContractDocumentaryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-sale/src/main/resources/mapper/intermediate/IntermediateContractMapper.xml

@@ -21,7 +21,7 @@
         FROM documents d
                  LEFT JOIN contract c ON d.contract_id = c.id
                  LEFT JOIN documents_transport dp ON d.id = dp.documents_id
-                 LEFT JOIN intermediate_contract ic ON ic.documents_id = d.id
+                 LEFT JOIN intermediate_contract ic ON ic.documents_ids = d.id
             ${ew.customSqlSegment}
     </select>