From ea50330a5da6daf9a6f498da8b40f841563015ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Wed, 7 Jan 2026 11:31:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=BA=E5=9C=B0=E6=97=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=97=B6=E8=BF=94=E5=9B=9E=E7=A9=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=80=8C=E9=9D=9E=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改login和refreshLoginInfo方法中的项目获取逻辑 - 当场地没有关联项目时返回空列表 - 初始化projects变量为空ArrayList Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com> --- .../buckets/.bloomcycle.bin/xl.meta | Bin 743 -> 743 bytes .../buckets/.usage-cache.bin.bkp/xl.meta | Bin 629 -> 630 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 629 -> 630 bytes .../.minio.sys/buckets/.usage.json/xl.meta | Bin 2359 -> 2360 bytes .../.usage-cache.bin.bkp/xl.meta | Bin 636 -> 636 bytes .../000000-assets/.usage-cache.bin/xl.meta | Bin 636 -> 636 bytes .../buckets/assets/.metadata.bin/xl.meta | Bin 1466 -> 1466 bytes .../assets/.usage-cache.bin.bkp/xl.meta | Bin 575 -> 575 bytes .../buckets/assets/.usage-cache.bin/xl.meta | Bin 575 -> 575 bytes .../controller/MartialMiniController.java | 26 +++++++----------- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 1b6dce6cbf556279f46ecdafe3a5520dbe9ebf63..67142a2913bec34cdae9a9f6b8be384f8ee25484 100644 GIT binary patch delta 462 zcmaFP`kZxwI&Vj4@Owsvv?DC-%|6p6nivagGI>$j^V%hC@tQut+`D?U6U*z^p^7H{ zF;!oZT9TN4Q^C~G(9qZ<+0?+))Z8G&%+xF?(Kyw@G|kM!(jv(u(R{KYqgwsKvUBN4 zry0)WYwg!&Y+RC8nv-*sF<8F!$>uvb=Wba}(mVBPo1R*2hvheBwF}PM9!(B8us*?B z)1CngT9zl578RxDl`t&HORXq5Yp=PyxFoTtBsJwY4=YGTX6)q#%@b1F*Ckgb=cGF4 z=N9Co0%h+o2tX9n167>=qqSW2GF-z23lm|jSqN^4*1|jA5Znz~dj)I|+&5Y)<(=T% ziyB(*7$zgQDcX#uWD(p2T7PQSBe-|8<+Bx!!}*sav<)3B5!?{1e}-NN?gVY=^eYJN f8Ew`rJ#g-24s8wY+X$|UwtHtVg4>`iTYn7z5m=p& delta 462 zcmaFP`kZxwI&b@lM_IRT=pJDy%iE_l(ZpDwedEE`ue_Xi7dv17KRYV+`NZ-%cBrC> ze@rJwFsjurNi9iCzp0RBY?hj2l$4xmXlZI;Xl7uMW|CxVnqp>RnQCa5XlS&s>|A=% zX@+yB-bS`CHZI94&B-~+80>l>d#&gF?emw3Pd}~i)^k(w$xTn)dEXa(`mf(_CjY}! z#*_gJT9zl578RxDl`t&HORXq5Ybvw6xFoTtBsHb}I1ejGNoI6~ue>Vr!ga}&$vLUc z`MCu-sX*yF3<7WkC3DQz^JE~nH_S`8Lg3s|5%VP-6A|11^RtHO2yT!0j^~jG?g{e^ z7pH@`^z;C?Yb|H~ZCEjKWKxA!B0 gn`6P{qmAIMFn`Rp0l|GL%qk*^u(-lkVb0Wg0O+rxN&o-= 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 40c0aa0c07555355938b6097eedb3d8793c626ab..55691e06b01dc869c65099fff2fc755ef984ecf0 100644 GIT binary patch delta 264 zcmey$@{MJJI&Vj4@Vjfb?2oW;ZuZxhXksid^ZeR6wo+Hq$+{_*xwOuzOe~L6KfEd+ zv8co`II}9Xc;ZEd!%ILcAidN#Br`YlvINwSiGOV6O_NfS(^Ab$6OD~cQ&W>HQc_cr zEfSLr43jO>3=9k>M=TG`8yhbzu-?n9ItLGWh_bl#IQ`DxbvSlF)*b#FEtGJgf{rkQsZq zLF+}|P$1;gM95=V~RGptA JS>o@}005Q?WO@Jq delta 263 zcmeyy@|9(RI&b@lM_JqM$Q)t$@kZ~$L=$5H^@R=gYy16!c5liPxEA3jFtI#N{m`m_ z#G(?%;LNJj;)xd-4lMz(fb>$|kj&iF%MwsSCjPONH#0CYNi;AsFikVJOffJpHcT-$ zwJE{Y>}93V3=%~W?*2ru%>+2FUl_#XX0dKU>E0NSiqrRa`b{@4}(I= XfliKP5_>pqZs(~wKS$D`A$%VI_pNHk diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index 0cfff96fd98a8ec64da86401762e37fda0395fdc..c3f10bc488496618d7a335d1ac4470e0210fefc9 100644 GIT binary patch delta 300 zcmdlkv_oiuI&Vj4@Ovi9okv(6IPb2TXkskjqa?fX_D0W{^A-tRkJl(aG_gERy=PTG zVo`}>aAs9%@x+VlJxf3=AidN#Br`YlvINwSiGNJhm!y^?rr%UZG&3?vO0zIYOEWZ2 zOEfb{OfodGG)yxyHLx&GO))l@Y{)2Qwy^A6deUizbBnB9Rxma$$t%stIm*7KFEjM{ z*XCr)rA4bR*LsTaoLs$n(r=q5Wjt>B68SqfcTQfzD4}5Xt-IH#fp*1tQM%*aB~;yT4n%YwrpE@sH``2u8WsC8;He={FV3%uI~TQVosF zk}XV3(~^x1(+pCLj1A3_jZ!TWEzOb_mYqvaI?Zq{`%}sW#>ORir8zlA*;hYj*!<1k z{;tW{ou4XeSM2mwNze&4Ge36e&7$Yurd_`AV)7bB2@TT_0}Cr-b1P$GJyR1yQ$tI0 z1CuBv9i{xFtkmR^V(0wQyb>iVBjd?$812}NEX^zp&CDkoGR4B#jLg!LH!v+{G@iVY k&6vs1Z1P>U!pZ-bC-=H>>5X=$cr$tH;=7RHIDW@d>d=1G$y81-~_-Fdo}v2jUWX->|O zm(RqH$*=jk+2Gc4Ar^Bz-4h8Wzy35jbu)@qO$c&c)qZ&LW=2C9dyQ2-iNz(M1u2Oo zsmFO(8Gs-&_Hu((gTv)XOlqpRN?RA@7fUTFD`r@nk_#k?tBPkcFfwtoGO&ZxE-K5I hE;ZSkNk&v4B8efYq^8He{#eR}8On1Q)ecC>0sy(!SI7VW delta 237 zcmeyv@`q)DI&b@lM_Exb_8npQ$~2{GqKUCUYsH(BwjE9ZyUshBl`smGOf0Wshbo%* z$40?2(ag})+`>4~%sef{!o)N!&A`w&E!il^z#t{bG|h5y1f!lV?>(cZjEzh3N^^3K zyljwCywMP-zh7_K#D$l+|7kPrV%;3_P>gl@iMc-#q{J>w-pptyV=BGMC$YFBv>+w1 zB=tBCD+3T@MpyXCKfbtT5|f&0T($qA{9^G%WyK7OQ*wbsaaHkb1_mZhRt9#E+C^m< h)5RxyGs%diBqT9JDb)1%*B?vSFhh9`7Gb1`SqvKshd%>YC@3ns`kT^H!~W_*lVovNh~f2El5c$ zNj=WP$^ZnJv6maP8XPW9Vp3DhRoc2JzgTKfSuw-nlw2TDTva@qfsu)um4O|kc2QZz hbg9YSOfsSZ5lIYDB{e<%^~X{+%ut@gsCGa~768mTS|k7f delta 237 zcmeyv@`q)DI&b@lM_K9>la8=xoK<}=(ZpClMk@50c8UAWX{Y->%&ta3^^dSTP}eq{Xksidd$rw?NJsadv(i^=yUlb)abkHLJ5wf*$7#o-5mFDCe zWl`&x61k#_f&FyP4<7rQ2TyztC=PpjT49sMC8eilW~NG{PTs<}O3^*F#HlnnJGI0o pKRK}^Ge1vBN2%D@$|tiJD!#d%X(}UobcM7|=Hs)QrCH`P0swjoPHg}H 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 9d9cd3cd4d98ea6c2112bcb8151074ca1acfff9c..f63379b2daced79e9f5daf00dc40d7e2ed4b8005 100644 GIT binary patch delta 178 zcmdnbvY%ywI&Vj4@H??BmyWRHv;^&%Xksi7busd?qoH^EXQD0X{@x3}@y@L6CKsYk@-%|?ahDJPrf*LGozM_y~Zk^#Nv|Bf|SIP d)Z;v?3_y?>d$~dL$N8O;e=<6;gsbZ*0026FNR0ph delta 178 zcmdnbvY%ywI&b@lN0}EqvyQMllkt?8Xkskz!?{mZ{EF+0rkAFHXD+zDo>*ST4plVq zkBxkirCC~%siCEzp|O#fiHU`QXnvtQ2SxTybg~jA>Mtxn`Ey)6mjZ5-Mb8?QX zsS`d>bM$mxa_`yAiWf4{!<5-9XNi5dFJ{_duwtXn6t2me8MS0grC0eR7MFw;q$HN4 c9_L|Y0D{cu3Saq%!n2cqGCHw1yvUmY023fZg#Z8m 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 ccec70bb65d1162d3d17aa0e41389c1ec8bb4494..7396a1adeb0292e1b71255202a4bdb7c21e577bc 100644 GIT binary patch delta 178 zcmdnbvY%ywI&Vj4@Z0-NqDNR3wSP;TXksjIqNF`SS?Kl$S1&5T+y_8O~v5{pYh3sMqG dQjhbnG5|ql?Bxc{ALn;Y{>kXX60WYN004*vNk{+y delta 178 zcmdnbvY%ywI&b@lN13yo43Dt5e%hii(ZpEb^{VvUEZ00`+A$ z|JcYUS(>FKnHpLe8X6m!nV47@n5HGCrWqNUn5Co|SXfLBXVlldEYK9m*tjIGG$-fC znmXYFHAhe9CHJ1)tau?KJxrO+a+cVK`(maY1}irDOyQcmnNdr|RC<+9VsS}mK}upt c>Tw=c1|Z0cuJDzQC_Fp)C!-UK!;8Eb0Ht3>od5s; diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java index 33d7747..a87bc25 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -115,7 +115,7 @@ public class MartialMiniController extends BladeController { } // 获取项目列表：总裁判看所有项目，其他裁判根据场地获取项目 - List projects; + List projects = new ArrayList<>(); Integer refereeTypeVal = invite.getRefereeType(); String roleVal = invite.getRole(); boolean isGeneralJudge = (refereeTypeVal != null && refereeTypeVal == 3) @@ -126,14 +126,11 @@ public class MartialMiniController extends BladeController { projects = getAllProjectsByCompetition(competition.getId()); } else if (Func.isNotEmpty(invite.getProjects())) { projects = parseProjects(invite.getProjects()); - } else { - // 未指定项目，根据场地获取项目；如果没有场地则获取所有项目 - if (invite.getVenueId() != null) { - projects = getProjectsByVenue(invite.getVenueId()); - } else { - projects = getAllProjectsByCompetition(competition.getId()); - } + } else if (invite.getVenueId() != null) { + // 未指定项目，根据场地获取项目；如果场地没有项目则返回空列表 + projects = getProjectsByVenue(invite.getVenueId()); } + // 如果没有场地，projects保持为空列表 MiniLoginVO vo = new MiniLoginVO(); vo.setToken(token); @@ -530,7 +527,7 @@ public class MartialMiniController extends BladeController { MartialJudge judge = judgeService.getById(invite.getJudgeId()); MartialVenue martialVenue = invite.getVenueId() != null ? venueService.getById(invite.getVenueId()) : null; // 获取项目列表：总裁判看所有项目，其他裁判根据场地获取项目 - List projects; + List projects = new ArrayList<>(); Integer refereeTypeVal = invite.getRefereeType(); String roleVal = invite.getRole(); boolean isGeneralJudge = (refereeTypeVal != null && refereeTypeVal == 3) @@ -541,14 +538,11 @@ public class MartialMiniController extends BladeController { projects = getAllProjectsByCompetition(competition.getId()); } else if (Func.isNotEmpty(invite.getProjects())) { projects = parseProjects(invite.getProjects()); - } else { - // 未指定项目，根据场地获取项目；如果没有场地则获取所有项目 - if (invite.getVenueId() != null) { - projects = getProjectsByVenue(invite.getVenueId()); - } else { - projects = getAllProjectsByCompetition(competition.getId()); - } + } else if (invite.getVenueId() != null) { + // 未指定项目，根据场地获取项目；如果场地没有项目则返回空列表 + projects = getProjectsByVenue(invite.getVenueId()); } + // 如果没有场地，projects保持为空列表 MiniLoginVO vo = new MiniLoginVO(); vo.setToken(token);