From 3c98edcdd8b526e87cd9c5a90697bc6b2fb44680 Mon Sep 17 00:00:00 2001 From: Ying Date: Mon, 28 Nov 2022 22:30:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E9=A1=B5=E8=BD=AC=E6=8D=A2int?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/developer/stubs/data/plugin.stub | Bin 11453 -> 0 bytes app/admin/controller/system/AdminGroup.php | 2 +- app/admin/controller/system/UserGroup.php | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 app/admin/controller/developer/stubs/data/plugin.stub diff --git a/app/admin/controller/developer/stubs/data/plugin.stub b/app/admin/controller/developer/stubs/data/plugin.stub deleted file mode 100644 index 4b628073cafd955d46d329860e46713dbd055eb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11453 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

VVK$3J~OKg$|L8sh_XIxZr@%ux#jtN zeQ1;_P+}fXqQmR=`jNe}rOnr%w`OM+Z8&lT?KI9-H#w?G*={ITc*Jycsk?#2Gqu{$ zR~Fk{6Y;n+HH#B+7+U#-E{d@~P9>Eb|S&*h4tC#ldD*|T<87{tG74v=>y7h{- z*OJ};PB$Uj;$x(Q$S1K^(godb+|vL{QLm$mU+SSNpBJFa#Z6s)?-d!}eeSEKep{Ex zaQo7sS-um7+of%;5?yNJ7;RtE%xY!AAOnQCMZ- zUX@`i!Jgja*o*{Za=2XSZcSFyqdjLkoo)F1NFGmq@Z;a~Wg+VbaQO84&S*x=!{@v< zH}ga%U09cN2p1VuCzeY7e1GLzVUx>J^#RW@~iu8=0U@9qS%mqDP= z%5l2h(atOmiX-_#9pcl^WWAf($=)SlYDFyo|^=-08 ztvf^sp7mVcOls=3qFomP6lbn}v!aiA6lczLjnF68Pcnn^Dczk7OJGXg?CTqaq)+VE zK650zA8MW=z)oHn%gFKK5b>2T!e9brNM^$nVfE5#+mfOmE@tVCrV==m0&Vk(7q~z{28TXUC#rr}Ke5A#Z2w z>UwK7I&QkAVkY?MOmN9eXx(gL@l16*R+v;*ejJ-e3D( zGpMPuNn|-!z9{m`pltz+)?%VzCf6iqqFc@+iOob8n`z^ckeh+2UCA$R#45r%*?_EL z%};{+fUa`|-J`>|d)$I$U7{;DkE3ukZ1E5Jt?MF6z0{oNh8q~x#r)@DoBA`qVM7+i zdm)7M!+G4<@8**S6k0`)3roGVH0K%OWgp@{cKsX`goNKd^qp|{j9fs2aO8tAf(T~( zvvUcu1xum)b!R>N`sd?R4NNZNJoFXJ&0-6@L}x5wqHA;`AFr=dgSt?y^pz$D!IB>G z+&!j9X4*8CmyapxjQbNIX9Czz;b8uG2Jz2395+_z?gRRTJL88rf!oFvvU<5X+L?3P zIa;!^!2Xxc+QHh5g-v4L14sAwcz+%3caxt-btu6)=Vey_`3 zaGm^OaJAyGJr8zUFo7hlPicyv2XsQq8|atqq<7r||1CHn%JJ~f&4fkH6%;9H%qE3G z!uaIZI?*6kFIP8n`%~0oIO&b{dj3-p*8euZF~a=zii+G9M&SP#=~@t4E$@mu`2o7 z!UK-pw!s5TA&G78%@6M0;0dpEPu?snEZ~}zE z6%Yr9-Cn>WfU_yPh{|{vqIUM*h;s-C*W(ayhZgX(G|nUhS_>}cKMkTspcVduwmTu= zk>wpQWKA{9z)r!#$m8x(;Dg}Xe?cnl->ks1Sv5S|93a8bs}E!Dx2O4!48hze$Q3?Z zaKQWrJN}0UHI^pt>bh^_(&}L&k47P)7hj$XIwC2K7%!)W{MX<||$h&h6JjF<<<=J0ybzD2YUrRK1ONA;vdVBtg3 z^%2J%u#QN|<_w#L?HJv=*%p23Fc1T9^gte7Qk8!Lk5x72>Izgj(A$xdW4rItVj6Cj$9o~VGI49}2Yaa~x_uvX1erNnCV^7)$65lTvbiX}KT*P(4 z9~S|B)V`AJ^j-h$+s8x6b7;;Voe_u`ruaC-3F}0PHjLJ<4O3Ib>M-rNBXD>%zy5=E z++6Tt+H!=Z>r2rv+J1YQjEHj~60)Gf%>|f@yJwv6?s~q2Xr1ENVe5`+i8vRUPUIY! z3vE#kb{#i*3nt|?RM>XwuTjUHp2ADHemd;#i8@bU^mM zw@LVR1Af1SH{@ug4G+O1KY+k((BT;X9kXSL_z|QqQy62vg*W7AQ3}tvL~+1?*#jxG z;0bIVKMA3`c7J(IprI diff --git a/app/admin/controller/system/AdminGroup.php b/app/admin/controller/system/AdminGroup.php index b843d91..231f163 100644 --- a/app/admin/controller/system/AdminGroup.php +++ b/app/admin/controller/system/AdminGroup.php @@ -56,7 +56,7 @@ class AdminGroup extends AdminController $count = $this->model->where($where)->count(); $limit = is_empty($param['limit']) ? 10 : (int)$param['limit']; $page = ($count <= $limit) ? 1 : $param['page']; - $list = $this->model->where($where)->order("id asc")->limit($limit)->page($page)->select()->toArray(); + $list = $this->model->where($where)->order("id asc")->limit((int)$limit)->page((int)$page)->select()->toArray(); foreach ($list as $key => $value) { $list[$key]['title'] = __($value['title']); } diff --git a/app/admin/controller/system/UserGroup.php b/app/admin/controller/system/UserGroup.php index 050b53b..ed30e15 100644 --- a/app/admin/controller/system/UserGroup.php +++ b/app/admin/controller/system/UserGroup.php @@ -37,8 +37,8 @@ class UserGroup extends AdminController if (request()->isAjax()) { $param = input(); - $param['page'] = input('page/d'); - $param['limit'] = input('limit/d'); + $param['page'] = input('page/',1); + $param['limit'] = input('limit',10); // 查询条件 $where = array(); @@ -54,9 +54,9 @@ class UserGroup extends AdminController // 查询数据 $count = $this->model->where($where)->count(); - $limit = is_empty($param['limit']) ? 10 : $param['limit']; + $limit = empty($param['limit']) ? 10 : $param['limit']; $page = ($count <= $limit) ? 1 : $param['page']; - $list = $this->model->where($where)->order("id asc")->limit($limit)->page($page)->select()->toArray(); + $list = $this->model->where($where)->order("id asc")->limit($limit)->page((int)$page)->select()->toArray(); foreach ($list as $key => $value) { $list[$key]['title'] = __($value['title']); }