Merge branch 'seller_census'

controller/census/seller.go

@@ -535,12 +535,12 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
 	sellerIds := make([]string,0)
 
 	if req.SellerType == 1 {
-		cond += ` AND b.contract_type = 1 `
-		historyCond += ` AND new_company = 1 `
+		//cond += ` AND b.contract_type = 1 `
+		//historyCond += ` AND new_company = 1 `
 		sellerIds = ficcSellerIds
 	} else if req.SellerType == 2 {
-		cond += ` AND b.contract_type IN (2,3,4) `
-		historyCond += ` AND new_company = 0 `
+		//cond += ` AND b.contract_type IN (2,3,4) `
+		//historyCond += ` AND new_company = 0 `
 		sellerIds = raiSellerIds
 	}