feat(game-event): 添加数据权限控制的数据查询方法

- 为AdviceMapper、GameAthleteMapper、GameEventConfigMapper、GameEventGroupMapper、GameEventProjectMapper、GameRefereeMapper和GameTeamMapper添加分页及列表查询方法，并应用数据权限注解
- 在各ServiceImpl中替换原有的selectVoPage和selectVoList调用为新增的带数据权限控制的方法
- 更新GameEventServiceImpl中的queryList方法以使用带数据权限控制的selectEventList方法
- 将部分Collectors.toList()替换为toList()以简化代码
- 移除GameEventServiceImpl中无用的页面路径注释

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/AdviceMapper.java

@@ -1,8 +1,17 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.system.domain.Advice;
+import org.dromara.system.domain.GameEventGroup;
 import org.dromara.system.domain.vo.AdviceVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.vo.GameEventGroupVo;
+
+import java.util.List;
 
 /**
  * 用户反馈建议Mapper接口
@@ -10,6 +19,27 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author wenkai
  * @date 2025-08-18
  */
+@Mapper
 public interface AdviceMapper extends BaseMapperPlus<Advice, AdviceVo> {
+    /**
+     * 分页查询队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<AdviceVo> selectPageAdviceList(Page<Advice> page, Wrapper<Advice> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
 
+    /**
+     * 获取队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<AdviceVo> selectAdviceList(Wrapper<Advice> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameAthleteMapper.java

@@ -1,12 +1,18 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.system.domain.GameAthlete;
+import org.dromara.system.domain.GameEventProject;
 import org.dromara.system.domain.bo.GameAthleteBo;
 import org.dromara.system.domain.vo.GameAthleteVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.vo.GameEventProjectVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,6 +26,24 @@ import java.util.Map;
  */
 @Mapper
 public interface GameAthleteMapper extends BaseMapperPlus<GameAthlete, GameAthleteVo> {
+    /**
+     * 分页查询运动员列表
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<GameAthleteVo> selectPageAthleteList(Page<GameAthlete> page, Wrapper<GameAthlete> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
+
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<GameAthleteVo> selectAthleteList(Wrapper<GameAthlete> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 
     @Select("select * from game_athlete where user_id = #{userId} AND del_flag = '0'")
     GameAthlete selectByUserId(Long userId);

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameEventConfigMapper.java

@@ -1,8 +1,16 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.system.domain.GameEventConfig;
+import org.dromara.system.domain.GameReferee;
 import org.dromara.system.domain.vo.GameEventConfigVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.vo.GameRefereeVo;
+
+import java.util.List;
 
 /**
  * 赛事配置Mapper接口
@@ -11,5 +19,25 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @date 2025-07-30
  */
 public interface GameEventConfigMapper extends BaseMapperPlus<GameEventConfig, GameEventConfigVo> {
+    /**
+     * 分页查询队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<GameEventConfigVo> selectPageEventConfigList(Page<GameEventConfig> page, Wrapper<GameEventConfig> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
 
+    /**
+     * 获取队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<GameEventConfigVo> selectEventConfigList(Wrapper<GameEventConfig> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameEventGroupMapper.java

@@ -1,9 +1,17 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.system.domain.GameEventGroup;
+import org.dromara.system.domain.GameReferee;
 import org.dromara.system.domain.vo.GameEventGroupVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.vo.GameRefereeVo;
+
+import java.util.List;
 
 /**
  * 赛事分组Mapper接口
@@ -13,5 +21,25 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface GameEventGroupMapper extends BaseMapperPlus<GameEventGroup, GameEventGroupVo> {
+    /**
+     * 分页查询队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<GameEventGroupVo> selectPageEventGroupList(Page<GameEventGroup> page, Wrapper<GameEventGroup> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
 
+    /**
+     * 获取队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<GameEventGroupVo> selectEventGroupList(Wrapper<GameEventGroup> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameEventMapper.java

@@ -22,62 +22,33 @@ import java.util.List;
 @Mapper
 public interface GameEventMapper extends BaseMapperPlus<GameEvent, GameEventVo> {
 
-//    /**
-//     * 分页查询赛事列表，并进行数据权限控制
-//     * 注意：如果赛事表没有部门字段，需要根据业务需求调整
-//     * 例如：如果赛事通过创建人关联，可以使用 userName 来控制
-//     * 如果赛事通过部门关联，可以使用 deptName 来控制
-//     *
-//     * @param page         分页参数
-//     * @param queryWrapper 查询条件
-//     * @return 分页的赛事信息
-//     */
-//    @DataPermission({
-//        @DataColumn(key = "deptName", value = "create_dept"),
-//        @DataColumn(key = "userName", value = "create_by")
-//    })
-//    default Page<GameEventVo> selectPageEventList(Page<GameEvent> page, Wrapper<GameEvent> queryWrapper) {
-//        return this.selectVoPage(page, queryWrapper);
-//    }
-//
-//    /**
-//     * 查询赛事列表，并进行数据权限控制
-//     *
-//     * @param queryWrapper 查询条件
-//     * @return 赛事信息集合
-//     */
-//    @DataPermission({
-//        @DataColumn(key = "deptName", value = "create_dept"),
-//        @DataColumn(key = "userName", value = "create_by")
-//    })
-//    default List<GameEventVo> selectEventList(Wrapper<GameEvent> queryWrapper) {
-//        return this.selectVoList(queryWrapper);
-//    }
-//
-//    /**
-//     * 更新赛事数据，并进行数据权限控制
-//     *
-//     * @param event         要更新的赛事实体
-//     * @param updateWrapper 更新条件封装器
-//     * @return 更新操作影响的行数
-//     */
-//    @Override
-//    @DataPermission({
-//        @DataColumn(key = "deptName", value = "create_dept"),
-//        @DataColumn(key = "userName", value = "create_by")
-//    })
-//    int update(@Param(Constants.ENTITY) GameEvent event, @Param(Constants.WRAPPER) Wrapper<GameEvent> updateWrapper);
-//
-//    /**
-//     * 根据ID更新赛事数据，并进行数据权限控制
-//     *
-//     * @param event 要更新的赛事实体
-//     * @return 更新操作影响的行数
-//     */
-//    @Override
-//    @DataPermission({
-//        @DataColumn(key = "deptName", value = "create_dept"),
-//        @DataColumn(key = "userName", value = "create_by")
-//    })
-//    int updateById(@Param(Constants.ENTITY) GameEvent event);
+   /**
+    * 分页查询赛事列表，并进行数据权限控制
+    *
+    * @param page         分页参数
+    * @param queryWrapper 查询条件
+    * @return 分页的赛事信息
+    */
+   @DataPermission({
+       @DataColumn(key = "deptName", value = "create_dept"),
+       @DataColumn(key = "userName", value = "create_by")
+   })
+   default Page<GameEventVo> selectPageEventList(Page<GameEvent> page, Wrapper<GameEvent> queryWrapper) {
+       return this.selectVoPage(page, queryWrapper);
+   }
+
+   /**
+    * 查询赛事列表，并进行数据权限控制
+    *
+    * @param queryWrapper 查询条件
+    * @return 赛事信息集合
+    */
+   @DataPermission({
+       @DataColumn(key = "deptName", value = "create_dept"),
+       @DataColumn(key = "userName", value = "create_by")
+   })
+   default List<GameEventVo> selectEventList(Wrapper<GameEvent> queryWrapper) {
+       return this.selectVoList(queryWrapper);
+   }
+
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameEventProjectMapper.java

@@ -1,10 +1,16 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.system.domain.GameEventProject;
 import org.dromara.system.domain.vo.GameEventProjectVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 赛事项目Mapper接口
  *
@@ -13,5 +19,32 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface GameEventProjectMapper extends BaseMapperPlus<GameEventProject, GameEventProjectVo> {
+    /**
+     * 分页查询项目列表，并进行数据权限控制
+     *
+     * @param page         分页参数
+     * @param queryWrapper 查询条件
+     * @return 分页的赛事信息
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<GameEventProjectVo> selectPageEventProjectList(Page<GameEventProject> page, Wrapper<GameEventProject> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
 
+    /**
+     * 获取项目列表，并进行数据权限控制
+     *
+     * @param queryWrapper 筛选条件
+     * @return 项目列表
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<GameEventProjectVo> selectEventProjectList(Wrapper<GameEventProject> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameRefereeMapper.java

@@ -1,12 +1,18 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.system.domain.GameReferee;
+import org.dromara.system.domain.GameTeam;
 import org.dromara.system.domain.bo.GameRefereeBo;
 import org.dromara.system.domain.vo.GameRefereeVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Mapper;
+import org.dromara.system.domain.vo.GameTeamVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -19,6 +25,27 @@ import java.util.List;
  */
 @Mapper
 public interface GameRefereeMapper extends BaseMapperPlus<GameReferee, GameRefereeVo> {
+    /**
+     * 分页查询队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<GameRefereeVo> selectPageRefereeList(Page<GameReferee> page, Wrapper<GameReferee> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
+
+    /**
+     * 获取队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<GameRefereeVo> selectRefereeList(Wrapper<GameReferee> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 
     /**
      * 根据项目id列表查询裁判（批量查询）

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/mapper/GameTeamMapper.java

@@ -1,9 +1,15 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.system.domain.GameEventProject;
 import org.dromara.system.domain.GameTeam;
 import org.dromara.system.domain.bo.GameTeamBo;
+import org.dromara.system.domain.vo.GameEventProjectVo;
 import org.dromara.system.domain.vo.GameTeamVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
@@ -18,6 +24,27 @@ import java.util.List;
  */
 @Mapper
 public interface GameTeamMapper extends BaseMapperPlus<GameTeam, GameTeamVo> {
+    /**
+     * 分页查询队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<GameTeamVo> selectPageTeamList(Page<GameTeam> page, Wrapper<GameTeam> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
+
+    /**
+     * 获取队伍列表，并进行数据权限控制
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
+    default List<GameTeamVo> selectTeamList(Wrapper<GameTeam> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
 
     @Select("""
                 SELECT * FROM game_team
@@ -54,5 +81,9 @@ public interface GameTeamMapper extends BaseMapperPlus<GameTeam, GameTeamVo> {
      * @param bo 查询条件
      * @return 队伍列表
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "create_dept"),
+        @DataColumn(key = "userName", value = "create_by")
+    })
     List<GameTeamVo> selectVoListWithGroupName(GameTeamBo bo);
 }

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/AdviceServiceImpl.java

@@ -63,7 +63,8 @@ public class AdviceServiceImpl implements IAdviceService {
         Long defaultEventId = Long.valueOf(cacheObject.toString());
         bo.setEventId(defaultEventId);
         LambdaQueryWrapper<Advice> lqw = buildQueryWrapper(bo);
-        Page<AdviceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<AdviceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<AdviceVo> result = baseMapper.selectPageAdviceList(pageQuery.build(), lqw);
         //提前查询出队伍id和name的映射并缓存
         Set<Long> ids = result.getRecords()
             .stream()
@@ -86,7 +87,8 @@ public class AdviceServiceImpl implements IAdviceService {
     @Override
     public List<AdviceVo> queryList(AdviceBo bo) {
         LambdaQueryWrapper<Advice> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+//        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectAdviceList(lqw);
     }
 
     private LambdaQueryWrapper<Advice> buildQueryWrapper(AdviceBo bo) {

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameAthleteServiceImpl.java

@@ -194,7 +194,8 @@ public class GameAthleteServiceImpl implements IGameAthleteService {
             }
         }
         LambdaQueryWrapper<GameAthlete> lqw = buildQueryWrapper(bo);
-        Page<GameAthleteVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameAthleteVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameAthleteVo> result = baseMapper.selectPageAthleteList(pageQuery.build(), lqw);
         result.getRecords().stream()
             .map(vo -> {
                 Optional.ofNullable(vo.getProjectValue())
@@ -238,7 +239,7 @@ public class GameAthleteServiceImpl implements IGameAthleteService {
                     });
                 return vo;
             })
-            .collect(Collectors.toList());  // 收集结果
+            .toList();  // 收集结果
         return TableDataInfo.build(result);
     }
 
@@ -259,7 +260,8 @@ public class GameAthleteServiceImpl implements IGameAthleteService {
             }
         }
         LambdaQueryWrapper<GameAthlete> lqw = buildQueryWrapper(bo);
-        List<GameAthleteVo> athleteList = baseMapper.selectVoList(lqw);
+//        List<GameAthleteVo> athleteList = baseMapper.selectVoList(lqw);
+        List<GameAthleteVo> athleteList = baseMapper.selectAthleteList(lqw);
         athleteList.forEach(vo -> {
             Optional.ofNullable(vo.getProjectValue())
                 .filter(StringUtils::isNotBlank)

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventConfigServiceImpl.java

@@ -64,7 +64,8 @@ public class GameEventConfigServiceImpl implements IGameEventConfigService {
             }
         }
         LambdaQueryWrapper<GameEventConfig> lqw = buildQueryWrapper(bo);
-        Page<GameEventConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameEventConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameEventConfigVo> result = baseMapper.selectPageEventConfigList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -85,7 +86,8 @@ public class GameEventConfigServiceImpl implements IGameEventConfigService {
             }
         }
         LambdaQueryWrapper<GameEventConfig> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+//        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectEventConfigList(lqw);
     }
 
     private LambdaQueryWrapper<GameEventConfig> buildQueryWrapper(GameEventConfigBo bo) {

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventGroupServiceImpl.java

@@ -113,7 +113,8 @@ public class GameEventGroupServiceImpl implements IGameEventGroupService {
             }
         }
         LambdaQueryWrapper<GameEventGroup> lqw = buildQueryWrapper(bo);
-        Page<GameEventGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameEventGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameEventGroupVo> result = baseMapper.selectPageEventGroupList(pageQuery.build(), lqw);
         result.getRecords().stream()
             .map(vo -> {
                 Optional.ofNullable(vo.getProjectList())
@@ -131,7 +132,7 @@ public class GameEventGroupServiceImpl implements IGameEventGroupService {
                     });
                 return vo;
             })
-            .collect(Collectors.toList());  // 收集结果
+            .toList();  // 收集结果
         return TableDataInfo.build(result);
     }
 
@@ -152,7 +153,8 @@ public class GameEventGroupServiceImpl implements IGameEventGroupService {
             }
         }
         LambdaQueryWrapper<GameEventGroup> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+//        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectEventGroupList(lqw);
     }
 
     private LambdaQueryWrapper<GameEventGroup> buildQueryWrapper(GameEventGroupBo bo) {

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventProjectServiceImpl.java

@@ -108,7 +108,8 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
             }
         }
         LambdaQueryWrapper<GameEventProject> lqw = buildQueryWrapper(bo);
-        Page<GameEventProjectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameEventProjectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameEventProjectVo> result = baseMapper.selectPageEventProjectList(pageQuery.build(), lqw);
 
         // 使用 forEach 直接修改原对象
         result.getRecords()
@@ -148,7 +149,8 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
 
         // 构建查询条件，排除默认赛事ID
         LambdaQueryWrapper<GameEventProject> lqw = buildQueryWrapperForProjectLibrary(bo, defaultEventID);
-        Page<GameEventProjectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameEventProjectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameEventProjectVo> result = baseMapper.selectPageEventProjectList(pageQuery.build(), lqw);
 
         // 处理记录
         result.getRecords().forEach(record -> {
@@ -192,7 +194,8 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
             }
         }
         LambdaQueryWrapper<GameEventProject> lqw = buildQueryWrapper(bo);
-        List<GameEventProjectVo> list = baseMapper.selectVoList(lqw);
+//        List<GameEventProjectVo> list = baseMapper.selectVoList(lqw);
+        List<GameEventProjectVo> list = baseMapper.selectEventProjectList(lqw);
         list.forEach(vo -> {
             Optional.ofNullable(vo.getEventId())
                 .filter(ObjectUtil::isNotEmpty)
@@ -555,7 +558,8 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
         if (CollectionUtils.isEmpty(projectIds)) {
             return Collections.emptyList();
         }
-        return this.baseMapper.selectVoList(
+//        return this.baseMapper.selectVoList(
+        return this.baseMapper.selectEventProjectList(
             new LambdaQueryWrapper<GameEventProject>()
                 .eq(GameEventProject::getEventId, eventId)
                 .in(GameEventProject::getProjectId, projectIds)

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventServiceImpl.java

@@ -168,9 +168,9 @@ public class GameEventServiceImpl implements IGameEventService {
     @Override
     public TableDataInfo<GameEventVo> queryPageList(GameEventBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<GameEvent> lqw = buildQueryWrapper(bo);
-        Page<GameEventVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // Page<GameEventVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         // 使用带数据权限注解的方法
-//        Page<GameEventVo> result = baseMapper.selectPageEventList(pageQuery.build(), lqw);
+       Page<GameEventVo> result = baseMapper.selectPageEventList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -184,8 +184,8 @@ public class GameEventServiceImpl implements IGameEventService {
     public List<GameEventVo> queryList(GameEventBo bo) {
         LambdaQueryWrapper<GameEvent> lqw = buildQueryWrapper(bo);
         // 使用带数据权限注解的方法
-//        return baseMapper.selectEventList(lqw);
-        return baseMapper.selectVoList(lqw);
+       return baseMapper.selectEventList(lqw);
+        // return baseMapper.selectVoList(lqw);
     }
 
     private LambdaQueryWrapper<GameEvent> buildQueryWrapper(GameEventBo bo) {
@@ -250,9 +250,6 @@ public class GameEventServiceImpl implements IGameEventService {
             // 构建scene参数，包含赛事ID
             String scene = "eventId=" + gameEvent.getEventId();
 
-            // 页面路径，实际使用时需要替换为真实路径
-//            String page = "pages/index/index";
-
             // 调用微信接口生成小程序码
             byte[] qrCodeBytes = getWxaCodeUnlimit(accessToken, scene, page);
             if (qrCodeBytes == null) {

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameRefereeServiceImpl.java

@@ -82,7 +82,8 @@ public class GameRefereeServiceImpl implements IGameRefereeService {
             }
         }
         LambdaQueryWrapper<GameReferee> lqw = buildQueryWrapper(bo);
-        Page<GameRefereeVo> result = gameRefereeMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameRefereeVo> result = gameRefereeMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameRefereeVo> result = gameRefereeMapper.selectPageRefereeList(pageQuery.build(), lqw);
         result.getRecords().forEach(vo -> {
             if (vo.getProjectList() != null) {
                 vo.setProjectList2(JSONUtil.toList(vo.getProjectList(), Long.class));
@@ -108,7 +109,8 @@ public class GameRefereeServiceImpl implements IGameRefereeService {
             }
         }
         LambdaQueryWrapper<GameReferee> lqw = buildQueryWrapper(bo);
-        List<GameRefereeVo> list = gameRefereeMapper.selectVoList(lqw);
+//        List<GameRefereeVo> list = gameRefereeMapper.selectVoList(lqw);
+        List<GameRefereeVo> list = gameRefereeMapper.selectRefereeList(lqw);
         list.forEach(vo -> {
             if (vo.getProjectList() != null) {
                 vo.setProjectList2(JSONUtil.toList(vo.getProjectList(), Long.class));

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameTeamServiceImpl.java

@@ -88,7 +88,8 @@ public class GameTeamServiceImpl implements IGameTeamService {
             }
         }
         LambdaQueryWrapper<GameTeam> lqw = buildQueryWrapper(bo);
-        Page<GameTeamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        Page<GameTeamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<GameTeamVo> result = baseMapper.selectPageTeamList(pageQuery.build(), lqw);
         // 查询领队和队员列表
         result.getRecords().stream()
             .map(vo -> {
@@ -134,7 +135,7 @@ public class GameTeamServiceImpl implements IGameTeamService {
                     });
                 return vo;
             })
-            .collect(Collectors.toList());  // 收集结果
+            .toList();  // 收集结果
         return TableDataInfo.build(result);
     }