no message

controllers/user.go

@@ -980,6 +980,12 @@ func (this *UserController) CountryCcode() {
 		br.Ret = 408
 		return
 	}
+	if uid == 0 {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
 	detail, err := models.GetUserDetailByUserId(uid)
 	if err != nil {
 		br.Msg = "获取信息失败"

models/activity.go

@@ -189,18 +189,17 @@ func GetScheduleCount(uid int) (count int, err error) {
 //我的日程列表
 func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT *,( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 ) AS is_signup,
+	sql := `SELECT art.*,( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 ) AS is_signup,
                      ( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND  s.is_cancel = 0  AND s.fail_type = 0 ) AS signup_num ,
 					 ( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ? ) AS is_cancel_meeting_reminder
             FROM cygx_activity AS art
-	        INNER JOIN cygx_activity_signup AS s ON s.activity_id = art.activity_id 
 			INNER JOIN cygx_my_schedule as my ON my.activity_id = art.activity_id 
-            WHERE 1=1 `
+            WHERE 1=1 AND my.user_id = ? `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, uid, uid, startSize, pageSize).QueryRows(&items)
+	sql += ` ORDER BY art.active_state,art.activity_time DESC  LIMIT ?,?`
+	_, err = o.Raw(sql, pars, uid, uid, uid, startSize, pageSize).QueryRows(&items)
 	return
 }