fix

controller/census/invoice_payment.go

@@ -535,8 +535,8 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 	}
 	if req.SellerIds != "" {
 		sellerIds := strings.Split(req.SellerIds, ",")
-		cond += ` AND (c.seller_id in ?)`
-		pars = append(pars, sellerIds)
+		cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
+		pars = append(pars, sellerIds, sellerIds)
 	}
 	// 套餐筛选
 	if req.ServiceTypes != "" {

models/fms/contract_invoice.go

@@ -604,7 +604,7 @@ func GetDuplicateContractInvoiceDetailItemList(companyName, startDate, endDate s
 	err = global.DEFAULT_MYSQL.Table("contract_invoice as a ").
 		Select(" a.* ").
 		Joins(" JOIN contract_register as b ON a.contract_register_id = b.contract_register_id ").
-		Where(fmt.Sprintf("a.is_deleted = 0 AND b.company_name = '%s' AND b.start_date= '%s' AND b.end_date= '%s' ",companyName, startDate, endDate)).
+		Where(fmt.Sprintf("a.is_deleted = 0 AND b.company_name = '%s' AND b.start_date= '%s' AND b.end_date= '%s' AND b.is_deleted=0 AND (a.invoice_type=3 OR a.invoice_type=4)",companyName, startDate, endDate)).
 		Order("a.contract_invoice_id ASC").
 		Find(&list).Error
 	if err != nil {