From 507a2aef41e4116a247cc87c4a6b42fb44be05d9 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 4 Sep 2020 11:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/mt/bean/vo/CompeteVo.java     | 15 +++++++++++++++
 .../resources/mapper_dao/CompetePlayerDao.xml     | 12 ++++++------
 .../main/resources/mapper_dao/CompeteTeamDao.xml  |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
index b21d9494..8f46dbc0 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
@@ -142,6 +142,21 @@ public class CompeteVo {
         private String qrCode;
         @ApiModelProperty("团队内的成员")
         private List<CompeteTeamProjectMember> members;
+//
+//        public CompeteTeamProject(Long teamId, byte type, String parentProjectName, String secondProjectName, byte certificate, byte creator, int memberMin, int memberMax, String qrCode) {
+//            this.teamId = teamId;
+//            this.type = type;
+//            this.parentProjectName = parentProjectName;
+//            this.secondProjectName = secondProjectName;
+//            this.certificate = certificate;
+//            this.creator = creator;
+//            this.memberMin = memberMin;
+//            this.memberMax = memberMax;
+//            this.qrCode = qrCode;
+//        }
+
+        public CompeteTeamProject() {
+        }
 
         public CompeteTeamProject(CompeteTeam team, byte isCreator, com.ccsens.mt.bean.po.CompeteProject project, String parentProjectName, List<CompeteTeamProjectMember> members) {
             this.teamId = team.getId();
diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
index 1ba0c914..a943bcff 100644
--- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
@@ -4,7 +4,7 @@
 
 
     <select id="getInfo" resultType="com.ccsens.mt.bean.vo.CompeteVo$GetPlayerInfo">
-         SELECT
+          SELECT
             p.id AS playerId,
             p.NAME,
             p.gender,
@@ -12,16 +12,16 @@
             p.id_card AS idCard,
             p.compete_group_id AS groupId,
             g.group_name AS groupName,
-            p.company_name AS companyName,
+            c.`name` AS companyName,
             p.id_card_front AS idCardFront,
             p.id_card_back AS idCardBack,
             p.prove_img AS proveImg
         FROM
-            t_compete_player p,
-            t_compete_group g
+            t_compete_player p LEFT JOIN
+            t_compete_group g on p.compete_group_id = g.id LEFT JOIN
+						t_compete_company c on p.company_id = c.id
         WHERE
-            p.compete_group_id = g.id
-            AND p.user_id = #{userId}
+            p.user_id = #{userId}
             AND p.rec_status = 0
             AND g.rec_status = 0
             LIMIT 1
diff --git a/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml b/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml
index 085e2867..4cfd3cf0 100644
--- a/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml
@@ -92,7 +92,7 @@
     </select>
     <select id="queryTeam" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTeamProject">
         SELECT
-            m.id as  teamId,
+            t.id as  teamId,
             p2.type,
             p2.name as secondProjectName,
             p1.name as parentProjectName,