From ca6512e483f171cec0145028db56ac864af5d35e Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 20 Jul 2023 14:57:23 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/CompetitionResultServiceImpl.java | 4 ++--
 .../service/impl/CompetitionTeamVsTeamServiceImpl.java    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
index 3a598d0b..8316d24e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
@@ -129,7 +129,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
             CompetitionResultVo team = obj.getMainTeam();
             team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId());
             team.setCompetitionVsId(obj.getTeamVsTeamVo().getId());
-            team.setTeamId(obj.getTeamVsTeamVo().getMainTeamId());
+            team.setCompetitionOfTeamId(obj.getTeamVsTeamVo().getMainTeamId());
             team.setTeamName(obj.getTeamVsTeamVo().getMainTeamName());
             competitionResultMapper.insertCompetitionResult(team);
         }else {
@@ -139,7 +139,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
             CompetitionResultVo team = obj.getGuestTeam();
             team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId());
             team.setCompetitionVsId(obj.getTeamVsTeamVo().getId());
-            team.setTeamId(obj.getTeamVsTeamVo().getGuestTeamId());
+            team.setCompetitionOfTeamId(obj.getTeamVsTeamVo().getGuestTeamId());
             team.setTeamName(obj.getTeamVsTeamVo().getGuestTeamName());
             competitionResultMapper.insertCompetitionResult(team);
         }else {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
index a56076ab..e2e736ca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
@@ -174,18 +174,18 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
         }
         //获取主队每节数据
         List<CompetitionResultVo> competitionResultList = competitionResultService.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
-        Optional<CompetitionResultVo> main = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
-        Optional<CompetitionResultVo> guest = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
+        Optional<CompetitionResultVo> main = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
+        Optional<CompetitionResultVo> guest = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
         List<CompetitionMembersScoreVo> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
         if(main.isPresent()){
             CompetitionResultVo resultVo =  main.get();
-            List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
+            List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
             resultVo.setMembersScoreList(membersScores);
             recordVo.setMainTeam(resultVo);
         }
         if(guest.isPresent()){
             CompetitionResultVo resultVo = guest.get();
-            List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
+            List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
             resultVo.setMembersScoreList(membersScores);
             recordVo.setGuestTeam(resultVo);
         }