Browse Source

no message

xingzai 7 months ago
parent
commit
f8b1c2e54b
2 changed files with 4 additions and 2 deletions
  1. 3 1
      controllers/cygx/user.go
  2. 1 1
      models/roadshow/rs_calendar_meeting_user.go

+ 3 - 1
controllers/cygx/user.go

@@ -1258,9 +1258,10 @@ func (this *UserController) TableDetail() {
 		totalRsCalendar, listRsCalendar, err := roadshow.GetRsCalendarMeetingUserByRai(condition, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户阅读记录,Err:" + err.Error()
+			br.ErrMsg = "获取用户阅读记录,GetRsCalendarMeetingUserByRai Err:" + err.Error()
 			return
 		}
+
 		total = totalRsCalendar
 		list, err = cygxService.HandleListRsCalendar(listRsCalendar)
 		if err != nil {
@@ -1268,6 +1269,7 @@ func (this *UserController) TableDetail() {
 			br.ErrMsg = "HandleListRsCalendar,Err:" + err.Error()
 			return
 		}
+
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(cygx.UserInteractionListResp)

+ 1 - 1
models/roadshow/rs_calendar_meeting_user.go

@@ -180,7 +180,7 @@ func GetRsCalendarMeetingUserByRai(condition string, startSize, pageSize int) (t
 			INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id = b.rs_calendar_id 
 			LEFT JOIN rs_calendar_meeting_label_group AS g ON g.rs_calendar_id = b.rs_calendar_id 
 		WHERE
-			1 = 1 ` + condition
+			1 = 1 ` + condition + ` GROUP  BY a.rs_calendar_id  `
 
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
 	err = o.Raw(totalSql).QueryRow(&total)