pasture: 牧场切换

http/middleware/auth.go

@@ -68,14 +68,8 @@ func RequireAdmin() gin.HandlerFunc {
 			unauthorized(c)
 			return
 		}
-		farmId := GetFarmId(c)
-		if farmId == "" {
-			unauthorized(c)
-			return
-		}
-
 		c.Set(UserName, userName)
-		c.Set(FarmId, FarmId)
+		c.Set(FarmId, GetFarmId(c))
 		c.Set(XRequestId, GetXRequestId(c))
 		c.Next()
 	}

module/backend/enum_options.go

@@ -129,14 +129,13 @@ func (s *StoreEntry) CowTransferPenReasonOptions(ctx context.Context) (*pastureP
 }
 
 func (s *StoreEntry) SystemUserOptions(ctx context.Context, depId int) (*pasturePb.ConfigOptionsListResponse, error) {
-	userModel, err := s.GetUserModel(ctx)
+	_, err := s.GetUserModel(ctx)
 	if err != nil {
 		return nil, xerr.WithStack(err)
 	}
 
 	systemUserList := make([]*model.SystemUser, 0)
 	pref := s.DB.Table(new(model.SystemUser).TableName()).
-		Where("pasture_id = ?", userModel.AppPasture.Id).
 		Where("is_delete = ?", pasturePb.IsShow_Ok).
 		Where("is_show =? ", pasturePb.IsShow_Ok)
 	if depId != -1 && depId > 0 {

module/backend/sql.go

@@ -58,7 +58,6 @@ func (s *StoreEntry) GetCurrentFarmInfo(ctx context.Context) (*model.AppPastureL
 	if farmId == "" {
 		return nil, xerr.Custom("请选择牧场信息")
 	}
-
 	appPasture, err := s.FindPastureByFarmId(ctx, farmId)
 	if err != nil {
 		return nil, xerr.WithStack(err)