Эх сурвалжийг харах

Merge branch 'feature/crm14.9_contract_change' of hongze/hz_crm_api into master

xyxie 1 жил өмнө
parent
commit
536e5ccd00

+ 3 - 1
models/company/company_renewal_record.go

@@ -89,7 +89,9 @@ WHERE
 	AND modify_time BETWEEN ? 
 	AND ? 
 	AND product_id = ?
-	AND seller_id in (` + sellerIds + `)
+	AND (share_seller_id in (` + sellerIds + `)
+	OR seller_id in (` + sellerIds + `))
+
 `
 	_, err = o.Raw(sql, startDate, endDate, productId).QueryRows(&list)