zwxi 1 year ago
parent
commit
fa8941cf66
2 changed files with 2 additions and 2 deletions
  1. 1 1
      controller/census/seller.go
  2. 1 1
      models/fms/contract_invoice.go

+ 1 - 1
controller/census/seller.go

@@ -58,7 +58,7 @@ func (ct *SellerController) GroupInvoiceList(c *gin.Context) {
 	}
 	outCond := ` department_id = %d AND parent_id = 0 `
 	outCond = fmt.Sprintf(outCond, departmentId)
-	cond := ` (invoice_type = %d OR invoice_type = %d) AND a.is_deleted = 0 AND a.seller_group_id != 0 `
+	cond := ` (invoice_type = %d OR invoice_type = %d) AND a.is_deleted = 0 AND a.seller_id != 0 `
 	cond = fmt.Sprintf(cond, fms.ContractInvoiceTypeMake, fms.ContractInvoiceTypePreMake)
 
 	//adminCond := ` (invoice_type = %d OR invoice_type = %d) AND is_deleted = 0 AND seller_group_id != 0 `

+ 1 - 1
models/fms/contract_invoice.go

@@ -744,7 +744,7 @@ func GetCensusSellerGroupInvoicePageListV2(page base.IPage, groupStr, condition
 
 	sqlCount := ` select count(1) as count from (SELECT * 
 				FROM
-					contract_invoice
+					contract_invoice AS a
 				WHERE
 					%s
 				AND seller_group_id IN (` + groupStr + `)