From e6560cc3b07feca2e720b5e79c2ce7a6930960d6 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Tue, 19 Mar 2024 14:39:47 +0800 Subject: [PATCH] =?UTF-8?q?app=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/system/AppUpdateDao.php | 1 + app/common/model/system/AppUpdate.php | 3 +++ app/common/repositories/system/LhappRepository.php | 4 ++-- app/controller/admin/system/Lhapp.php | 1 + route/admin/system.php | 5 ----- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/common/dao/system/AppUpdateDao.php b/app/common/dao/system/AppUpdateDao.php index be39bb94..2f626ec6 100644 --- a/app/common/dao/system/AppUpdateDao.php +++ b/app/common/dao/system/AppUpdateDao.php @@ -40,6 +40,7 @@ class AppUpdateDao extends BaseDao public function search(array $where = []) { + return AppUpdate::getDB() ->when(isset($where['id']) && $where['id'] !== '',function($query) use($where){ $query->where('id',$where['id']); diff --git a/app/common/model/system/AppUpdate.php b/app/common/model/system/AppUpdate.php index e9b57ba2..be38de35 100644 --- a/app/common/model/system/AppUpdate.php +++ b/app/common/model/system/AppUpdate.php @@ -9,6 +9,9 @@ class AppUpdate extends BaseModel public static function tablePk(): string { + + + return 'id'; } diff --git a/app/common/repositories/system/LhappRepository.php b/app/common/repositories/system/LhappRepository.php index 2568824b..31ee4ee4 100644 --- a/app/common/repositories/system/LhappRepository.php +++ b/app/common/repositories/system/LhappRepository.php @@ -25,7 +25,7 @@ use think\facade\Cache; * @package app\common\repositories\system * @author xaboy * @day 2020-04-24 - * @mixin CacheDao + * @mixin */ class LhappRepository extends BaseRepository { @@ -33,7 +33,7 @@ class LhappRepository extends BaseRepository /** * CacheRepository constructor. - * @param CacheDao $dao + * @param $dao */ public function __construct(AppUpdateDao $dao) { diff --git a/app/controller/admin/system/Lhapp.php b/app/controller/admin/system/Lhapp.php index 344ce0bd..a4461962 100644 --- a/app/controller/admin/system/Lhapp.php +++ b/app/controller/admin/system/Lhapp.php @@ -34,6 +34,7 @@ class Lhapp extends BaseController public function list() { + [$page, $limit] = $this->getPage(); $where = $this->request->params(['type']); return app('json')->success($this->repository->getList($where, $page, $limit)); diff --git a/route/admin/system.php b/route/admin/system.php index b9ffbee5..a1ab53a3 100644 --- a/route/admin/system.php +++ b/route/admin/system.php @@ -208,12 +208,7 @@ Route::group(function () { '_auth' => true, ]); - - - - Route::group(function () { - Route::get('menus', 'admin.system.auth.Menu/menus'); Route::get('system/city/lst', 'merchant.store.shipping.City/lst'); //退出登陆