no message

controllers/roadshow/calendar.go

@@ -2928,7 +2928,6 @@ func isSellerRole(roleType string) (ok bool) {
 //func init() {
 //	init16_2()
 //}
-//
 //func init16_2() {
 //	listDate, err := roadshow.GetRsCalendarResearcherListInit16_2()
 //	if err != nil {
@@ -2963,7 +2962,7 @@ func isSellerRole(roleType string) (ok bool) {
 //		}
 //
 //		if productItemRai != nil && (RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN) {
-//			err = roadshow.UpdateRsCalendarSeller(productItemRai.SellerId, productItemRai.ShareSellerId, productItemRai.CompanyId)
+//			err = roadshow.UpdateRsCalendarSeller(productItemRai.SellerId, productItemRai.ShareSellerId, v.RsCalendarId)
 //			if err != nil && err.Error() != utils.ErrNoRow() {
 //				fmt.Println(err)
 //				return

models/roadshow/calendar.go

@@ -1006,15 +1006,15 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
 
 func GetRsCalendarResearcherListInit16_2() (item []*RsCalendar, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM  rs_calendar WHERE activity_type = '路演' AND company_id > 0   GROUP BY company_id  `
+	sql := `SELECT * FROM  rs_calendar WHERE activity_type = '路演' AND company_id > 0  	AND sys_user_id IN (SELECT  admin_id  FROM admin WHERE role_type_code  IN  ('rai_seller','rai_group','rai_admin') )    AND seller_id = 0 `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
 // 修改可见范围
-func UpdateRsCalendarSeller(seller_id, share_seller_id, company_id int) (err error) {
+func UpdateRsCalendarSeller(seller_id, share_seller_id, rs_calendar_id int) (err error) {
 	o := orm.NewOrm()
-	sql := `UPDATE rs_calendar SET seller_id=?, share_seller_id= ?   WHERE company_id =?  `
-	_, err = o.Raw(sql, seller_id, share_seller_id, company_id).Exec()
+	sql := `UPDATE rs_calendar SET seller_id=?, share_seller_id= ?   WHERE rs_calendar_id =?  `
+	_, err = o.Raw(sql, seller_id, share_seller_id, rs_calendar_id).Exec()
 	return
 }