juzheng/integrity-checkin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

审核用户type过滤

Browse Source
This commit is contained in:
juzeon
2023-01-30 12:12:53 +08:00
parent 865e6b6ce7
commit a190e759c7
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dao/checkin.go
View File

@@ -86,16 +86,17 @@ func (c CheckinDAO) FindAllActivities(isTeacher bool) []po.Activity {
}
func getUserActivityExtendedSQL(where string) string {
return "select ua.*,a.category activity_category," +
"a.name activity_name from user_activity ua left join activities a on a.id=ua.activity_id " + where +
"a.name activity_name from user_activity ua left join activities a on a.id=ua.activity_id " +
"left join users u on u.id=ua.user_id " + where +
" order by created_at desc"
}
func (c CheckinDAO) FindAllUserActivities(status int) []dto.UserActivityExtended {
func (c CheckinDAO) FindUserActivitiesByStatusUserType(status int, userType int) []dto.UserActivityExtended {
var arr []dto.UserActivityExtended
var err error
if status != 0 {
err = c.Tx.Raw(getUserActivityExtendedSQL("where status=?"), status).Find(&arr).Error
err = c.Tx.Raw(getUserActivityExtendedSQL("where status=? and u.type=?"), status, userType).Find(&arr).Error
} else {
err = c.Tx.Raw(getUserActivityExtendedSQL("")).Find(&arr).Error
err = c.Tx.Raw(getUserActivityExtendedSQL("where u.type=?"), userType).Find(&arr).Error
}
if err != nil {
panic(err)