From d825532b5487036d4538083c2ad6045388cf4a28 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Fri, 25 Aug 2023 14:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=90=83=E5=91=98=E5=A4=B4=E5=83=8F=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/CompetitionMembers.java   | 2 ++
 .../java/com/ruoyi/system/domain/CompetitionOfTeam.java    | 3 ++-
 .../ruoyi/system/domain/vo/CompetitionMembersScoreVo.java  | 1 +
 .../resources/mapper/system/CompetitionMembersMapper.xml   | 7 ++++++-
 .../mapper/system/CompetitionMembersScoreMapper.xml        | 3 ++-
 .../resources/mapper/system/CompetitionOfTeamMapper.xml    | 6 +++++-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
index 4454b33f..612bcb63 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java
@@ -136,6 +136,8 @@ public class CompetitionMembers extends BaseEntity
     /** 个人照片（最新） */
     @Excel(name = "个人照片", readConverterExp = "最=新")
     private String personalPhoto;
+    @Excel(name = "是否隐藏头像")
+    private Boolean isHideAvatar;
 
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
index 9542fc5a..b561324e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
@@ -67,7 +67,8 @@ public class CompetitionOfTeam extends BaseEntity
     /** 联系人 */
     @Excel(name = "领队人")
     private String contacts;
-
+    @Excel(name = "是否隐藏头像")
+    private Boolean isHideAvatar;
     /** 联系人电话 */
     @Excel(name = "领队人电话")
     private String contactsTel;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java
index 5eb3f56a..0fa58ea2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java
@@ -13,4 +13,5 @@ public class CompetitionMembersScoreVo extends CompetitionMembersScore {
     private String realName;
     private Long totalCount;
     private Long avgCountScore;
+    private Boolean isHideAvatar;
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
index b119d982..9016ffe0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
@@ -38,10 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="teamPosition" column="team_position"/>
         <result property="height" column="height"/>
         <result property="weight" column="weight"/>
+        <result property="isHideAvatar" column="is_hide_avatar"/>
     </resultMap>
 
     <sql id="selectCompetitionMembersVo">
-        select id, user_id, role_code, competition_id, competition_team_id, score, penalty, two_points, three_points, breaks, rebound, block, is_deleted, created_by, modified_by, created_time, last_updated_time, status, user_type, competition_of_team_id, competition_nature, real_name, jersey_number, id_type, id_card_no, contacts_tel, contacts, contacts_area_code, personal_photo, is_first_launch,team_position,height,weight from competition_members
+        select id, user_id, role_code,is_hide_avatar, competition_id, competition_team_id, score, penalty, two_points, three_points, breaks, rebound, block, is_deleted, created_by, modified_by, created_time, last_updated_time, status, user_type, competition_of_team_id, competition_nature, real_name, jersey_number, id_type, id_card_no, contacts_tel, contacts, contacts_area_code, personal_photo, is_first_launch,team_position,height,weight from competition_members
     </sql>
 
     <select id="selectCompetitionMembersList" parameterType="CompetitionMembers" resultMap="CompetitionMembersResult">
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="personalPhoto != null  and personalPhoto != ''"> and personal_photo = #{personalPhoto}</if>
             <if test="isFirstLaunch != null "> and is_first_launch = #{isFirstLaunch}</if>
             <if test="teamPosition != null"> and team_position = #{teamPosition}</if>
+            <if test="isHideAvatar != null"> and is_hide_avatar = #{isHideAvatar}</if>
         </where>
     </select>
     
@@ -193,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teamPosition != null">team_position,</if>
             <if test="height != null">height,</if>
             <if test="weight != null">weight,</if>
+            <if test="isHideAvatar != null">is_hide_avatar,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -227,6 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teamPosition != null">#{teamPosition},</if>
             <if test="height != null">#{height},</if>
             <if test="weight != null">#{weight},</if>
+            <if test="isHideAvatar != null">#{isHideAvatar},</if>
          </trim>
     </insert>
 
@@ -265,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teamPosition != null">team_position = #{teamPosition},</if>
             <if test="height != null">height = #{height},</if>
             <if test="weight != null">weight = #{weight},</if>
+            <if test="isHideAvatar != null">is_hide_avatar = #{isHideAvatar},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
index 68546c30..8dac6a0b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
@@ -104,7 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sco.block,
         sco.fault,
         sco.breaks,
-        IFNULL( sco.is_first_launch, 0 ) AS isFirstLaunch
+        IFNULL( sco.is_first_launch, 0 ) AS isFirstLaunch,
+        if(team.is_hide_avatar,team.is_hide_avatar,member.is_hide_avatar) as isHideAvatar
         FROM
         competition_team_vs_team vs
         INNER JOIN competition_of_team team ON ( vs.main_team_id = team.id OR vs.guest_team_id = team.id ) and team.competition_id = vs.competition_id
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
index 1fd75233..ad615123 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
@@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serialNumber"    column="serial_number"    />
         <result property="teamLogo" column="team_logo"/>
         <result property="captain" column="captain"/>
+        <result property="isHideAvatar" column="is_hide_avatar"/>
     </resultMap>
 
     <sql id="selectCompetitionOfTeamVo">
-        select id, competition_id, team_id, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number,team_logo,captain from competition_of_team
+        select id, competition_id, team_id,is_hide_avatar, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number,team_logo,captain from competition_of_team
     </sql>
     <select id="selectCompetitionOfTeamById" parameterType="Long" resultMap="CompetitionOfTeamResult">
         <include refid="selectCompetitionOfTeamVo"/>
@@ -231,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serialNumber != null">serial_number,</if>
             <if test="teamLogo != null">team_logo,</if>
             <if test="captain != null">captain,</if>
+            <if test="isHideAvatar != null">is_hide_avatar,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">#{competitionId},</if>
@@ -250,6 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serialNumber != null">#{serialNumber},</if>
             <if test="teamLogo != null">#{teamLogo},</if>
             <if test="captain != null">#{captain},</if>
+            <if test="isHideAvatar != null">#{isHideAvatar},</if>
          </trim>
     </insert>
 
@@ -273,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="teamLogo != null"> team_logo = #{teamLogo},</if>
             <if test="captain != null"> captain = #{captain},</if>
+            <if test="isHideAvatar != null">is_hide_avatar = #{isHideAvatar},</if>
         </trim>
         where id = #{id}
     </update>