Merge branch 'crm_15.9.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/company/company_product.go

@@ -145,7 +145,7 @@ func UpdateRaiCompanyProductIsUserMakerByCompanyids(companyIds []int) (err error
 			o.Rollback()
 		}
 	}()
-	sql := `UPDATE company_product SET is_user_maker = -1 WHERE is_user_maker=1 AND product_id=2  `
+	sql := `UPDATE company_product SET is_user_maker = -1 WHERE  product_id=2  AND  company_id > 1  `
 	_, err = o.Raw(sql).Exec()
 	if err != nil {
 		return

services/rai_company_user_bill.go

@@ -614,11 +614,11 @@ func UpdateCompanyProductIsUserMaker() (err error) {
 	for _, v := range listKpCompanyId {
 		companyIds = append(companyIds, v.CompanyId)
 	}
-
-	if len(companyIds) == 0 {
-		return
-	}
-	fmt.Println(len(companyIds))
+	companyIds = append(companyIds, 0)
+	//if len(companyIds) == 0 {
+	//	return
+	//}
+	//fmt.Println(len(companyIds))
 
 	e = company.UpdateRaiCompanyProductIsUserMakerByCompanyids(companyIds)
 	if e != nil {