优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2718,23 +2718,23 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             //（含公司非担保贷款业务、二级自主贷款即外部金融，抵押放款的业务）,全款自用资金业务不允许，担保贷款业务不涉及
             ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSid(params.getUserSid(), params.getOrgPath());
             if (!busList.getData().isEmpty()) {
-                qw.in("busSid", busList.getData());
+                qw.in("cc.busSid", busList.getData());
             } else {
                 IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
                 page.setRecords(new ArrayList<>());
                 return page;
             }
             if (StringUtils.isNotBlank(params.getName())) {
-                qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
+                qw.and(wrapper -> wrapper.like("cc.partyB", params.getName()).or().like("cc.contractNo", params.getName()));
             }
             if (StringUtils.isNotBlank(params.getContractNo())) {
-                qw.like("contractNo", params.getContractNo());
+                qw.like("cc.contractNo", params.getContractNo());
             }
             if (StringUtils.isNotBlank(params.getCustomerName())) {
-                qw.like("partyB", params.getCustomerName());
+                qw.like("cc.partyB", params.getCustomerName());
             }
         }
-        qw.orderByDesc("createDate");
+        qw.orderByDesc("cc.createDate");
         IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
         IPage<ContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
         return iPage;