搜索

internal/model/user/model.go

@@ -63,6 +63,7 @@ type UserFilterParams struct {
 	SubscribeId       *int64
 	UserSubscribeId   *int64
 	ShortCode         string
+	DeviceId          *int64
 	FamilyJoined      *bool
 	FamilyStatus      string
 	FamilyOwnerUserId *int64
@@ -187,6 +188,10 @@ func (m *customUserModel) QueryPageList(ctx context.Context, page, size int, fil
 				conn = conn.Joins("LEFT JOIN user_device ON user.id = user_device.user_id").
 					Where("user_device.short_code LIKE ?", "%"+filter.ShortCode+"%")
 			}
+			if filter.DeviceId != nil {
+				conn = conn.Joins("LEFT JOIN user_device ud ON ud.user_id = user.id").
+					Where("ud.id = ?", *filter.DeviceId)
+			}
 
 			if filter.FamilyJoined != nil {
 				if *filter.FamilyJoined {
@@ -228,7 +233,13 @@ func (m *customUserModel) QueryPageList(ctx context.Context, page, size int, fil
 			}
 
 			if filter.Order != "" {
-				conn = conn.Order(fmt.Sprintf("user.id %s", filter.Order))
+				order := strings.ToUpper(filter.Order)
+				if order != "ASC" && order != "DESC" {
+					order = "DESC"
+				}
+				conn = conn.Order(fmt.Sprintf("user.id %s", order))
+			} else {
+				conn = conn.Order("user.id DESC")
 			}
 			if filter.Unscoped {
 				conn = conn.Unscoped()