From e50b71a13d41071fb034c863177bd28b4e54a39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Wed, 31 Dec 2025 15:10:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(registration):=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E6=97=B6=E9=97=B4=E5=8A=A8=E6=80=81=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 1: 待开始 (赛事未开始) - 2: 进行中 (赛事进行中) - 3: 已结束 (赛事已结束) --- .../buckets/.bloomcycle.bin/xl.meta | Bin 743 -> 743 bytes .../buckets/.usage-cache.bin.bkp/xl.meta | Bin 629 -> 637 bytes .../buckets/.usage-cache.bin/xl.meta | Bin 629 -> 637 bytes .../.minio.sys/buckets/.usage.json/xl.meta | Bin 2358 -> 2359 bytes .../.usage-cache.bin.bkp/xl.meta | Bin 626 -> 626 bytes .../000000-assets/.usage-cache.bin/xl.meta | Bin 626 -> 626 bytes .../assets/.usage-cache.bin.bkp/xl.meta | Bin 575 -> 575 bytes .../buckets/assets/.usage-cache.bin/xl.meta | Bin 575 -> 575 bytes .../MartialRegistrationOrderServiceImpl.java | 45 ++++++++++++++++-- 9 files changed, 40 insertions(+), 5 deletions(-) diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index b333c709bac9fa7eea51d3bd168abfab4af2a029..c82612d33a4aa9a2c1ff61fe7f036a3eda4b1870 100644 GIT binary patch delta 460 zcmaFP`kZxw29LGDDchx6j<77q5!^V@#8_b7=Im*L4vrbkEK_Hj{E(2GSYFQtQ8V$6 z>EsATwfZHgC5h=b6;h1MEzB&EEzB*FOwG+xOiWVEEfbARj7^dg4b6?xj24!iOHVq@ zaPHMsg%-xfC3&SeIY$|TnU5;+SP5!;^|;+$aewBesf#T+S=Cvue0lU_>3Q8BTJM%h zFn~eJ^5oK@qSU++h9!Ba6(wgSmM$+YNh~T!O{qW5!wOQ88FI!#PEFosU2QfyxBcDxb&$Ad9A(52<{YluUowc?ge=Z4jwr7G>^PxW>ZyXDsA1*)0JRkd_Vr delta 460 zcmaFP`kZxw29M>+g~cjnM_4ph{#!rM#8{v>=v08mDc|4QnSMxJ6Dj1q38k-wiSSA{p8z)&L8ziL~T9~JpTbdcETA2^)r zlwbgZmgUK%MMbH3B@9dQQY%W%N^~wSE=epZNliJTnpo&8(vNuaq;TjGlsH{F8hv3eU6WqTA!M!0Teda2hdssxy<>g%j zH$YCmR20GOk;|6qLvT;X+2nh}xkp&!9J6(ABlr$-Nz2+0+#0zwlM)1Xhn&aJLkR8{ exfIJIaPCn9IoH+(1UE;nB=r@7yFxBUd?Em4t(|}X 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 f9912c599c934aab4345975635c81a8e690be335..65ae8ab623bf2e60a34fa34a23d7d036995ebbd3 100644 GIT binary patch delta 350 zcmey$@|R_T29LGDDe2e3M_9g3JMemrO&H(c3oVtJhUsZ{}q zMJ0~GnN_L96E8BHS^{DL>7~9QnYpQ#CE6f{O#EY`U~XucVriCWU|?pEVvw3>kZNI= zoMvcXZkm{EWC7$%j$qWYp4~a`1!LoqywaSUBd_|r{v4FG)4ZA#5*g{`ns{rf<9o*V z<$tPYrMs@|m9?+r(AcW~*M&ip;VLTw3)kd>j8gSWR{10rmxLCiB$lKe=V4_4g3ORJ z7V;`H=d2FS&MfdqP0Y#6OFy*KIWajSwRx=p80aPz7pImKcPvWIn6Rk0>Jr1FdlrlG ziv<^z6*DYO$psR{RmHOz7?{|A7J+g&tFEj<9fkoU?kOiLpT1`W;Wt#`-_mz1|`6g#XTsqO#ET54mVj75dZ}+nW^U?bi8hEK6aUyKm>XKASehjo7?@e47^Ef|q*@pz zrx_ZUn4%m&Cnjg4Hm@}R1Kq^p;?$Djjz!5C6BZR$U1E52&tg%2 zvEZVzVur;jxj>@0s(3a70}~t2B9NJj$}*-4f*1@83zH8m)CcLDv}{qaauowm9|Hp? gL#62j1O81#3||^}_b~V=>`O`z^We+4YNKWd00BIN@Bjb+ delta 342 zcmey%@|9(R29M>+h005(A7ObJb$tCq6Jr5;+paeT39hrIb_H5Q`4nkRERRz^v??I6 zsKhZivnsWC;zfo-OF%3jz0@}(GdK0JL>t7AiGOSqEG-NzlFbdwlT1u44NOc8l2X$Q zk}OOt4b9WcEsTs)CPy&pS?5%mrZF}y$t%stIr6B+x=c_kQ#Y$gV5)S}JGJ*3h12#d zE%BDvt7%u9diu5}hsIX@zb*`-3{zPdLO3TMWR$A!Sml#gToPK4l30>@oQIVG2r@&C zu8@-|yRkYrJF~zeH8CeMFa6L`=fvcU)aGT0#l@*5#T|>1GbSu5u3}h}U(B$mte9bO zN-mHnt}31lGGS3!#&m{-$%hu|gA`6$YXAnimlz)1vjFN4WMX4wU=ieESim8zU~=?= cV-JHu%7IRfWfFThZf@tPIzLC!W9RP>0O1mY?EnA( diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index def50885b3a3eb0fd09174d027d48d9508b8949c..9f84cbc42783515f5a9a4f92a121ee50af267b62 100644 GIT binary patch delta 196 zcmdlcv|VU|29LGDDSP|GBP^T!r@otLVk~eV@#SJ38TZ6VlGd$-aj)4XmdB}guL?*k zDsc?XtV%7Oc#*w(35W%xm->ce=B8ejXoDCs@sEvyg-McuL29z0nTe^1rGcq|p^1rw znX#E=YKoCbqDe~P+9A#fEwcV=yRQ;!wAwioq-IxBFYh`oX te$}^=M|pBiNG)N!@pSSUMrlEFD+5a_6B9jCBO?<_BV$9e&DR;@*#T+KOB?_I delta 195 zcmdlkv`uJ&29M>+g(VyBA7Oc(Y-upj#8|+>rL5d`x6_SHp(^{_L=WanERR#~S{0C3 zRN@$%S(REm@gjTI5)cbWFZB({%uT&4(FQSO;vXA@6k}796bnNmgH*#53o`>_1B+Ax zqa-5(Lj&_vBTFO8$q|fdddD@x4Hz4j+9A#g{oA5d*{S#08)V#&reI5#rYjlo; p&oF;k`!e`>zmCY$m6O*nN(-1-nHXA`nCO`rfS`rR<{OOh>;V2kOH=>= 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 c69711a2a1762c52c6c647c98aa922f2246ea69d..95433bfc6dcc7e558c0a403990bd8776adfd0912 100644 GIT binary patch delta 189 zcmeyw@`+`F29LGD$;b&#M_6{f_{=lW#8|-Yy3a4ODSpPC$)2Ye@-h}pEU#ySsG0c3 zbaDivTFjEvlEn0z3TY`OCaEcwCdsKuDW-`gmMNCzsm4Yo#wO;LX_h7y77NSHr6-+c zI43ak$_mEDC3&SeIY;hK{kStYac0vBA(n6c&jsuFT7T?~n)pxQj&yYwe@0Ao+T_iQ pM$$`G`6L#XgchVEmZTo%VPyb<%#bq{a$$BNlbG^Y=6X$U0|1z8OP2ru delta 190 zcmV;v073uq1o8xsC=5BNp!iI&!~}z>iO-QVGZ2ZPp~ahGM0SFmOHLDRKmL(-e+D_J zp!iI&k^D6$q-AtrXW1Y&VmUQtIc7CCFlIPpW;14HHZ?P0Fk?AmVKg%~VKFe1F##qu zp?1z^V#@%|7yKv80fD4$b!=?J-<|gIn%GA;Qh2Cu&);vPH(Lv}`gz;BmI2 s_mi^$G8>4hOks0$Rd8fsbY;g31poj50BKaks2#*4*pdQn1b|^vTrG)G&j0`b 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 7789ac6a7fdc1b277302281469562ba7b326dda0..c9c6fa3c02fd642df0af94c7525bf62211e45e58 100644 GIT binary patch delta 189 zcmeyw@`+`F29LGDN!|HTM_8`%sJKitF&5Zp)Ytzc-C^I%&s*Ae&yVk$SYFQtQ8V$6 z>EsATwU{NTC5h=b71B~nOj1)UO_EcSQcM#~EK@AaQ;m&Gj7`if(=1IaEEblXOHVq@ zaBgegvv$VDC3&SeIY;hK{kStYac0vBA(n6c&jsuFT7T?~n)pxQj&yYwe@0Ao+T_iQ pM$$`G`6L#XgchVEmZTo%VPyb<%#bq{a$$BNlbG^Y=6X$U0{}H(O!@!- delta 190 zcmV;v073uq1o8xsC=5BNpv}-y#00Fw`h$@)GZ5Y5QdiK!M30S4txw3}Nm`M2e+D_J zpv}-yk^D6$q-AtrXW1Y&VmUQtIc7CCFlIPpW;14HHZ?P0Fk?AmVKg%~VKFe1F##qu zp?1z^V#@%|myj{I0fD4$b!=?J-<|gIn%GA;Qh2Cu&);vPH(Lv}`gz;BmI2 s_mi^$G8>4hOks0$Rd8fsbY;g31poj50BKaks2#*4*pdQn1b|^vTr(n6YXATM 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 19047b63642b45b0d4b03e2d5ce4de25b802beed..f53c756dcae0d7a99fb35779dd0700c7bfceeb7b 100644 GIT binary patch delta 175 zcmdnbvY%yw29LGD$+MeNkFeZ};p>=aVk}U(M$WU~wxir+y?s3Q&goyASYFQtQ8V$6 zje@1Ap^>GrX_8SIkY$;eY-VJbXl!C;XqISUoMLHVHaUV(UuUbg0b}EmywaSUBWqT# zv$NT}J<2jSDa_^avE`*bhre8qKI7?|Ug<9QoKJ*#@@7VD=_RXt5{pYh3sMqGQjhbn ZG5|ql$QcW{vx}J~|73Jx*(G>%D*#LXLwW!J delta 175 zcmdnbvY%yw29M>+1&vGR9AQzsexqrkiLt=ih!+9#1l_romqevJkJ9U%SYFQtQ8V$6 zje?0mN=k}Bs&S&JnQ4lFWtyS6NlL1vp@F%jxv`~bYTD!oMtz;e$}NnIOY%x{a*nLw z_L+XX=I62YIa7{Szx*qo>NZDn9Y^Vo4T^V!uQN=t-Z6PIqqcO%DxbvSlF)*b#FEtG bJgf{rkQs7xg{)^@<>a4?PAq4?$GQLjaF<5; 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 5e798e862438dec877404a8c41e7eb05de160e25..81eb346333836108328f3f7e025a596f243f077d 100644 GIT binary patch delta 176 zcmdnbvY%yw29LGD$t9OIA7SZx?|6KoiLt=JqT{sKLnBLL(i_+04i=(b&Yy&@9oyIK|S!Y;pvnp6=&_`L>LWOY%x{a*nK7 zz0S^N^Y$pq+@vs<%g2_N_8k6lLHdlRZ+fM>;B!6^=E<8GwWXJ=@<}W%2`xxTEJ;1i a!^!{znIUH^+1tDy+jORir8zlA z)^PhwKVI|mSo@qQN2_1{l}~k>qq&ZwbjJq8JHpo)CRy*8yqQs3x?`13VsS}mK}upt c>Tw=c1|Y}`Il4mDGp};;Pevz}v)^M~04m8y!T getListWithRelations(Long userId, Integer status, Integer current, Integer size) { - // Build query + // Build query - don't filter by status here, we'll filter after calculating LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MartialRegistrationOrder::getUserId, userId); - if (status != null) { - queryWrapper.eq(MartialRegistrationOrder::getStatus, status); - } queryWrapper.orderByDesc(MartialRegistrationOrder::getCreateTime); // Paginate @@ -110,7 +132,7 @@ public class MartialRegistrationOrderServiceImpl extends ServiceImpl 0) { + voList = voList.stream() + .filter(vo -> filterStatus.equals(vo.getStatus())) + .collect(Collectors.toList()); + } + voPage.setRecords(voList); + voPage.setTotal(voList.size()); return voPage; }