Pārlūkot izejas kodu

Merge branch 'fms_2.9'

zwxi 1 gadu atpakaļ
vecāks
revīzija
3aceae1d0b
1 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. 2 1
      models/fms/contract_invoice.go

+ 2 - 1
models/fms/contract_invoice.go

@@ -773,8 +773,9 @@ func GetCensusSellerInvoicePageListV2(page base.IPage, adminStr, inCond, conditi
 				AND c.seller_id IN (` + adminStr + `)
 				GROUP BY c.seller_id ORDER BY %s LIMIT %d,%d `
 
-	sqlCount := ` select count(1) as count from (SELECT * 
+	sqlCount := ` select count(1) as count from (SELECT c.* 
 				FROM contract_invoice AS c
+				INNER JOIN contract_register AS b ON c.contract_register_id = b.contract_register_id 
 				WHERE %s
 				AND c.seller_id IN (` + adminStr + `) GROUP BY c.seller_id ) as a
 				 `