From e70dbd1144ac042edde72b0897b588da93f38bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= <hongjianli_email@126.com>
Date: Wed, 31 Dec 2025 15:56:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(athlete):=20=E9=80=89=E6=89=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E6=8E=89=E9=9B=86=E4=BD=93=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buckets/.bloomcycle.bin/xl.meta           | Bin 743 -> 743 bytes
 .../buckets/.usage-cache.bin.bkp/xl.meta      | Bin 637 -> 629 bytes
 .../buckets/.usage-cache.bin/xl.meta          | Bin 637 -> 629 bytes
 .../.minio.sys/buckets/.usage.json/xl.meta    | Bin 2359 -> 2359 bytes
 .../.usage-cache.bin.bkp/xl.meta              | Bin 636 -> 636 bytes
 .../000000-assets/.usage-cache.bin/xl.meta    | Bin 636 -> 636 bytes
 .../assets/.usage-cache.bin.bkp/xl.meta       | Bin 575 -> 575 bytes
 .../buckets/assets/.usage-cache.bin/xl.meta   | Bin 575 -> 575 bytes
 .../martial/mapper/MartialAthleteMapper.xml   |   1 +
 9 files changed, 1 insertion(+)

diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta
index 0bf5a1cf338e13ec950afaaf3c70cc4701860827..82d62268a2491818d6bdceb593142c8685472759 100644
GIT binary patch
delta 356
zcmaFP`kZxwCimvd)B~@Numpba6`5#aEbu*_ZBuc(f9%?Y9&v|GM;J^jZ(s#0nfS*>
zA;mPs+$=HC+`uH+DACfy(lo`wI5E*8Daq8x+&nqeWO4+fUj4QpnK;JAC3&SeIY$|T
zeYs4WPU!q*(%Gx`Pfa+}KiP+Gjrj6kOCp6;PaU{0)AF(e0~oX{PcAJgO3f=_Sdy1o
zQF2z|^77)6#G;bal;b?CAQhP**BRvhT1{M+T$!Ac>YSfjkdq3Oy~7{?S8%yTVV=t5
z9;WDexX@Jv^+T*%5!@JsUp4Cy+!=~$d3O=qD~kD|QE=`x0Y$r~mk?YZMVJ0)1h+%s
X`>YNG_lTm{R|P1S1LRo6{h2!f7mj=7

delta 347
zcmaFP`kZxwCb#K2zWSv{SgwnUR7^B67VuK&WR}_Ldc1v-!<-+Jx;IQLZ(s#0nfS*>
zAt}kwIL*Y!*w84++%hFG*~Hw^(lRyK!pzv%JjEi#U~&YbUj4_@*OV9=m*kb^<Q!!T
zj&+=qn)dqUA^UTOF711u^}+45_4A$E_MLg~*D(6%s;b6Q5)5F_vOKx8s3<kBgkecu
zYDLLeiBrpqOA?DpQd5reu!2-%hFp0f-}2dRU2<h|PO5W$Zb42eQ1%Xk09?Vv1htm4
z^(PSgISPq7NYXbHQZrw`WiN>+6v#b6a03*=m)u2gdlV`P0ukI33e$UC;oQqC3e)SX
R5L^d^K6Nb!ck*AxWB|useP{px

diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta
index c8c51428a9c9092e338949f0edcf4b9043de4648..3e873779cd4da0f62315e26178a5359959d68133 100644
GIT binary patch
delta 341
zcmey%@|9(RCimt{^<V5qSf;5w`#90WSRgpHX?bd`^Y*FFqC^}*Iu}hWk5fOiDj>0_
z#4$LtDz$jxMTSF5KrA4=)HftEH}$ean=ROoiGOSq(ku*&%#w`^Qqqjg3@t6vk_=7E
z&5V-_QcaUmEX^%aCPy&pS$At3kY#LKl2@9ObL5fZ`QJMA{!e=roZMRepx<WNf&N(%
zM?KmP+h<+;?SEmWIETho{l6{@q6|}68A3QGA7qrOzqHCHvA86(ASJOR^*9eJ0}y0}
zTxU>>O?kUII6JezBQ-H6GcWznQs>0vjMV03iN(dKCB+?!k~1bODz0K!lwZuSsH~V_
zaY`<bD6T4=4KiU-S;lmRg~^8&>Vp(cT5A9Xx|bLp-LnAd5M*LwWndBHVpzZ-tzdHW
df@2SZLdt<oj%5;iIBss|sX9ML^1>W<8359Yh;aY_

delta 349
zcmey$@|R_TCb#L@7srnrVVUi@yKAC}v4FRM;)f;YeHOJVd^5PKQf)S|JWl=8s({3z
z635`os?_3%7a2}10kMGeQs0ow+|<hwZMI-TCjPNeFfuo>v`jWmGc`#}H8f96OfogL
zOf)sNurM??F-b~GoE*WZXRVgHTAZ<QNnUAA&XHHSzwQ_<3jS4U{ed-HJ9eJNKG$tA
zuOBZuoReZ_{-)l>i$i0p{$CdcQHHCm3@lue4>C&CpIqgWSX>fXkdj!EdYp%q0SGcf
zt~^ngv3>38;Oxu-kJQAR%)InNOPv#wGg6z^8i0XrVsUY5NpZ)b<ctZ6imNU$Ji2GG
zD8E>6QCTs=;*?w<QCw9#n}LCe4QLU_%td7x(*;2c28M;nhZgFCbWU2fs93p*0jQ6G
ifs>)q^nwBZrXq$f4ZM38{1o;jC5U<OWhm+SJqG|~xrj&r

diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta
index 104e9eab79d713b1b97051dee4cf44d034d15073..0ce9a0c46c9bf149841a178241eaa2d1d1dc49a1 100644
GIT binary patch
delta 356
zcmey%@|9(RCimt{w)I6vSjwIs5S(aYEWmcPB4fq{Kb8KK`=|Qv6qlJ;9;be2RX}1<
ziDPhPRci6XiwuXBfLK6!sc%STZt7);He0YE6aSd1FG(#)Ouwm+W?^7tmTY8@l4fjX
zXlap_WN2b;W}IY@YMPW{X>O4+*^p7qd12YP^rX`a=L9ugSur*)$t%stIr7Ny{BNCl
z|EE0*PHruK&~G#CK>sX>qaN*t?Xxca_P;PwoI_)){$CdcQHH6k3?ZD84>C&CUs~mp
zSX>fXkdj!EdYp%q0SGcft}`gcro3GpoSj+Vk(!v3nU{WOsdHj-Mr!l2#Ny)AlH!g<
z$r%$C6<0AV$}eVER94KeI3*WI6jv3`2AQy^EMq#u!sJ5>^+5_Jtu+7x-AfFQ?pXkJ
t2r{v;GO!48F)ZMaRxmkw!Lf%yA>}|P$1;gM95=V~RGptAd0~#b3;>`;k1hZJ

delta 363
zcmey$@|R_TCb#L@gNpx-uw0aUzILLCvB2K=8v*CmdcK|Ok~RIzg;$Id%j48ftqMpi
zDsc?XtV%7Oc#+}M5)cbWFZB({%uT&4(Pj%aWa1yw$q|fdSxZt&64P%g7@3<`S|%H(
znVKY~8k(mjCYc&rCYl;sSQwg{m?WhoE-X8jo^+bw+_s?8zZe^r<dx>+9C?-d>yFW)
z;9sTIA6Ub+W9Mn?bKMs6`thQ}IVpDLZ|ZHlI5f8E|8-#yWw^@9z``~8Afr_M$yGjy
z#U-HyDTyVi$9Y&8fFLvE$`ged+t;oR&dx0GNKMSi%u7GC)HyLZBei+00T}2e78j?M
z6n892&X};Mxatzaqk9&M@{0u*l@&8APRRul#Z|?#85o$@fEIzwTvV1ZT@b`zU|5)Z
xXrVqx=cHweij}Jvfch91I2kHUFBtG|Dq{H3z`KXRPhnqDf|v(ihLWD&a{wADl5PM1

diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta
index be8eeee210b25dd22d73eb783a5c96fffdc9ffce..0f3b47c854f93115bb3f822147bc4a754cfabd96 100644
GIT binary patch
delta 159
zcmV;Q0AT;O61NhNDGRe{Y<!c%1ggAgs*yA^5HBsEEEW1lwul1Y%UZnG+L3pF1+!^v
ze3Oy<JRmtTVKp*gIb$+pH8VCbFk&(`GGj0}F=H`iF=I3_VPun70VXb5xhWk1fuwGA
zY;45`t8M7Rny0sOQ(JIRx*i)ey!^Lule&RU*m+?T91OnayOXQ|9S=1%Iy5vcH8nXm
NHaIvjGqczMUk3u=J-Yw^

delta 159
zcmV;Q0AT;O61NhNDGN2O5R*>C1PN8iW05p75XZQlkQBZ`$hMi1#C>M}d69R31vRb^
zlTMNRJRo8*FgG|iFk&+~Ffuh`IWRXhV>M(pGG#MnIW;&lGcc1_0VXb|QF507fuwGA
zY;45`tA9)|pgrkf&+YkatR7pz2um;9<mwPE<pHb-SP#0bPm`<x9S<}%Iy5vcH8eIj
NH#sygHM7_OUk5mCJBI)O

diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta
index 53f5b8fcb058fcce96a09f74b8f9bc7d502a7b71..b62b44bf1775b5a92c9218a52b131685251a96cd 100644
GIT binary patch
delta 176
zcmV;h08jt?1pEY$DGRe`-eW|>1RbFb*^x9e5F&&2w#ULi`-3f)d*tT$vypdz1+!@0
zV?>esVpTadFfuV_IA&xrVK+BnFlAyhI5S~0GB-G3H8o{6W-y_4&SzrF0L~uHt2+UK
zq;7R=Y{coOh>ZZlc8wv>n-<=#J%9TROk39&^hc~2$SamU4~u$}vjH+2(yB~hb97a3
eWMOn=#|#Ak0001KRM!9?*4)^V0(b-_>kJc>U`i1H

delta 176
zcmeyv@`q)DCb#KY?$n1zSeT1gG$)!E3$*wq%(NBuJJ_`3PNi4LW0#5L4Xj`#6aOTI
z8X2Y-SQr=@Cng%Cni`s<7$ln;CmN)srJ1CqnHndhEG#>ho^+bwT<Ox;{)~-F@=9}Z
zj=a1gkn)|8dv#+D)6BlK+x~yfE_tH4DMjAxO!)@&<BNT!P2S9CBz<y~PhxRNXhBM1
cN$PPPRt6x*47u_|ep`0wB&G@$G4)?A06_CcSO5S3

diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta
index cd42da60f9a0cfb4fb2608ce7a4c5e8997924405..57ccb7ec1897b8bdf00162e2ed82a8d6261d9fe6 100644
GIT binary patch
delta 173
zcmeyv@`q)DCimuyhVBJNSS<Kn{g`NCEKs`TV)TRyevh_0_%YtikZqk<-oOf0GVza%
zf~A>(kztxeT8dGkxp|^NYLc;qaiX!2xkaL>X{uS8!Q===JzbyAA;yf2OY%x{a*n)Q
z-qFi&xU5(4!fdg7>ul?P^ZG<zm-ynoM)HLAG&}z8s>z!fjifKF@<}W%2`xxTEJ;1i
Z!^!{znIYF16t3O5F^Q>yMeQ|@FaS8&ML+-m

delta 173
zcmV;e08;<_1pEY$DGN2M-QYXK1hfF3fsr&b5TwYMPzu{e`G#&U-{e$E<dJuP1vRYQ
z;5(80JRmYLWH2}|F*9LdFl99{G-NPiH#1={W@ctIW@a@rVq}w80WK}n@BqdEfuwGA
zY;45o)DUF%0Sl{vYyz2%X4_Bv&7|ZhvSc4d%y+OS$D>S^ld}Ob8_B9nVRLj<aAaY0
bWycH!00000X;jqYAGT|Ck^*=H7AN{d81+b5

diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta
index d2a1c45a57295e65cde2062a4d87f9836b14c975..c2e88a1e74f82ee22dc7bf8aa761304c72ec6245 100644
GIT binary patch
delta 173
zcmdnbvY%ywCimtHZnyR$EUuj4786a31r%8LxU43)Z*A#ZFBLWaKJUcx23D|=iGOV5
z4bxIg6H|<g5>rww3{z8$jm#|!&5}|rQ`3wLjFSx~hcoKy&a!?Z&)B#muQVs;$QmXo
z?$%|i&cv>)`g|)k{fX75H}^Mw)@od0`|5+#o^s1ylQ%PJOJ7>$lUQ65T9A@hl6stn
Zl>rDcL#{I@Xn#|h{FBj%MXPMP00654LbLz?

delta 173
zcmV;e08;<I1iu83DGN2Nka`)!1ih>SIgvCo5J$V>SEu<;yT4<xA-zZbRFQXp1vRaZ
zdKr=YJRdk^VP-HnWH&N2G&L|~H(@ztG-fw7VKg`}Wn^YDFq2mSFD=10Gvon*q;7R=
zY{abj_5gjs0&Gr){<+RW=^)?R>f0|2<OvNj&jO)j-yEuwvjHm`$*N3Yb97a3WMOn=
b#|#Ak0001KRMg}kI#cA6`2j)%upRe0_XbAu

diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta
index bdd8368d39c4bc2a6eebf193628fe46552013569..e16db94054adb5f4669fa33e03f5febcc74a934e 100644
GIT binary patch
delta 188
zcmV;t07L)31iu83DGRe_*TpTw1V4~`ppi5)5O^K<r<?0Rgq6(67t&3gwvl&$1+!<@
z#VwKiHIrBYCS0UtbYW-NATefSHDP2jGGSz8I5A~qGcq?gF*aglIb~)tFf(H@WTAG>
zXJX3$&R={cxdDNsZgp&I#H<1u3x%et%w4H^^V(f!<T~=~-?8&5fuud^@EW{#Ir@{c
q0V^BQs!U;XbX9O<VRU833<UrH003!J*8m_Z_9Bz{0YU^ScDE318c^E+

delta 189
zcmV;u07C!21iu83DGN2NVLrCR1hp4>LXk8x5I|K@xlaZ`A)Q0?u}p61Mv-@b1vRZ<
zKDLqkH7BHHbYW-NAUI`VW-vKqH!?IdH85p2VL4?qW;ZoqG&nG2WM(ojWRo!gCN-gU
z&SzrF0M6I6>-zzLq;7R=Y{abj_5gjs0&Gr){<+RW=^)?R>f0|2<OvNj&jO)j-yEuw
rvjHm`$*N3Yb97a3WMOn=#|#Ak0001KRMg}kI#cA6`2j)%upRe09NSIx

diff --git a/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.xml b/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.xml
index 7168a93..4e48ea8 100644
--- a/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.xml
+++ b/src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.xml
@@ -12,6 +12,7 @@
 		LEFT JOIN martial_competition c ON a.competition_id = c.id AND c.is_deleted = 0
 		LEFT JOIN martial_project p ON a.project_id = p.id AND p.is_deleted = 0
 		WHERE a.is_deleted = 0
+		AND (a.team_name IS NULL OR a.player_name != a.team_name)
 		<if test="athlete.competitionId != null">
 			AND a.competition_id = #{athlete.competitionId}
 		</if>