Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

service/supply_service.go

@@ -21,7 +21,7 @@ func GetSupplyList(ctype int64, page int64, limit int64, keyword string, orgid i
 	if len(keyword) > 0 {
 		keyword = "%" + keyword + "%" //联系人
 		db = db.Joins("left join xt_supplier_contacts on xt_supplier_contacts.supplier_code = xt_supplier_name.supplier_code")
-		db = db.Where("xt_supplier_contacts.name like ? or xt_supplier_name.supplier_code like ? or xt_supplier_name.supplier_name like ? ", keyword, keyword, keyword).Group("xt_supplier_name.id")
+		db = db.Where("xt_supplier_contacts.status = 1 and xt_supplier_contacts.user_org_id = ? and xt_supplier_contacts.name like ? or xt_supplier_name.supplier_code like ? or xt_supplier_name.supplier_name like ? ", orgid, keyword, keyword, keyword).Group("xt_supplier_name.id")
 	}
 	if ctype > 0 {
 		db = db.Where("xt_supplier_name.supplier_type = ?", ctype)