|
@@ -35,12 +35,14 @@ import org.dromara.common.json.utils.JsonUtils;
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
import org.dromara.common.redis.utils.RedisUtils;
|
|
import org.dromara.common.redis.utils.RedisUtils;
|
|
|
|
|
+import org.dromara.system.domain.GameAthlete;
|
|
|
import org.dromara.system.domain.GameEvent;
|
|
import org.dromara.system.domain.GameEvent;
|
|
|
import org.dromara.system.domain.GameEventGroup;
|
|
import org.dromara.system.domain.GameEventGroup;
|
|
|
import org.dromara.system.domain.PdfEntry;
|
|
import org.dromara.system.domain.PdfEntry;
|
|
|
import org.dromara.system.domain.bo.*;
|
|
import org.dromara.system.domain.bo.*;
|
|
|
import org.dromara.system.domain.constant.GameEventConstant;
|
|
import org.dromara.system.domain.constant.GameEventConstant;
|
|
|
import org.dromara.system.domain.vo.*;
|
|
import org.dromara.system.domain.vo.*;
|
|
|
|
|
+import org.dromara.system.mapper.GameAthleteMapper;
|
|
|
import org.dromara.system.mapper.GameEventMapper;
|
|
import org.dromara.system.mapper.GameEventMapper;
|
|
|
import org.dromara.system.config.FileUploadConfig;
|
|
import org.dromara.system.config.FileUploadConfig;
|
|
|
import org.dromara.system.service.*;
|
|
import org.dromara.system.service.*;
|
|
@@ -1831,7 +1833,7 @@ public class GameEventServiceImpl implements IGameEventService {
|
|
|
// 查询运动员数据
|
|
// 查询运动员数据
|
|
|
GameAthleteBo gameAthleteBo = new GameAthleteBo();
|
|
GameAthleteBo gameAthleteBo = new GameAthleteBo();
|
|
|
gameAthleteBo.setEventId(eventId);
|
|
gameAthleteBo.setEventId(eventId);
|
|
|
- List<GameAthleteVo> athleteVoList = gameAthleteService.queryList(gameAthleteBo);
|
|
|
|
|
|
|
+ List<GameAthleteVo> athleteVoList = gameAthleteService.queryListNoPermission(gameAthleteBo);
|
|
|
|
|
|
|
|
if (CollectionUtil.isEmpty(athleteVoList)) {
|
|
if (CollectionUtil.isEmpty(athleteVoList)) {
|
|
|
gameBibTaskService.updateTaskStatus(taskId, "3", "当前赛事没有队员数据");
|
|
gameBibTaskService.updateTaskStatus(taskId, "3", "当前赛事没有队员数据");
|
|
@@ -2074,7 +2076,7 @@ public class GameEventServiceImpl implements IGameEventService {
|
|
|
|
|
|
|
|
// 获取赛事ID(从athlete对象中获取)
|
|
// 获取赛事ID(从athlete对象中获取)
|
|
|
Long shId = athlete.getEventId();
|
|
Long shId = athlete.getEventId();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 获取赛事名称和队伍名称
|
|
// 获取赛事名称和队伍名称
|
|
|
String shName = athlete.getEventName();
|
|
String shName = athlete.getEventName();
|
|
|
String dwName = athlete.getTeamName() != null ? athlete.getTeamName() : "未知队伍";
|
|
String dwName = athlete.getTeamName() != null ? athlete.getTeamName() : "未知队伍";
|