fix

src/main/java/cn/quantgroup/customer/service/impl/VccServiceImpl.java

@@ -276,13 +276,9 @@ public class VccServiceImpl implements IVccService {
         }
         if (StringUtils.isNotBlank(query.getPhone())){
             phone = query.getPhone();
-            booleanExpression =  booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.phone.eq(phone));
-        }
-        if (StringUtils.isNotBlank(query.getOrderNo())){
-            booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.orderNo.eq(query.getOrderNo()));
         }
-        if (StringUtils.isNotBlank(query.getBillId())){
-            booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.billIds.contains(query.getBillId()));
+        if (StringUtils.isNotBlank(phone)){
+            booleanExpression =  booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.phone.eq(phone));
         }
         if (query.getApprovalStatus() != null){
             booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.approvalStatus.eq(query.getApprovalStatus()));
@@ -290,6 +286,17 @@ public class VccServiceImpl implements IVccService {
         if (query.getRepayType() != null){
             booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.repayType.eq(query.getRepayType()));
         }
+        if (StringUtils.isNotBlank(query.getOrderNo())){
+            booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.uniqueId.eq(query.getOrderNo()));
+        }
+        if (StringUtils.isNotBlank(query.getBillId())){
+            if (1 == query.getRepayType()){
+                booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.bills.contains(query.getBillId()));
+            }else {
+                booleanExpression = booleanExpression.and(QOfflineRepaySubmitRecord.offlineRepaySubmitRecord.uniqueId.eq(query.getBillId()));
+            }
+        }
+
         long count = offlineRepaySubmitRecordRepo.count(booleanExpression);
         int offset = (query.getPageIndex() -1) * query.getPageSize();
         Page<OfflineRepaySubmitRecord> plantPage = offlineRepaySubmitRecordRepo.findAll(booleanExpression, new PageRequest(offset, query.getPageSize()));