|
@@ -541,9 +541,10 @@ func GetCalendarDetailList(condition string, pars []interface{}) (list []*Calend
|
|
|
func GetRsMattersList(startDate, endDate string, researcherId int) (list []*RsMatters, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
//sql := `SELECT * FROM rs_matters AS a WHERE a.start_date>=? AND a.end_date<=? AND sys_user_id=? `
|
|
|
- sql := `SELECT * FROM rs_matters AS a WHERE a.end_date>=? AND sys_user_id=? `
|
|
|
+ //sql := `SELECT * FROM rs_matters AS a WHERE a.end_date>=? AND sys_user_id=? `
|
|
|
+ sql := `SELECT * FROM rs_matters AS a WHERE sys_user_id=? `
|
|
|
sql += ` ORDER BY a.create_time DESC `
|
|
|
- _, err = o.Raw(sql, endDate, researcherId).QueryRows(&list)
|
|
|
+ _, err = o.Raw(sql, researcherId).QueryRows(&list)
|
|
|
return
|
|
|
}
|
|
|
|