审核用户type过滤

dao/checkin.go

@@ -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)