diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php index 2a3ce1cb0..a6851ea21 100644 --- a/crmeb/app/services/system/SystemRouteServices.php +++ b/crmeb/app/services/system/SystemRouteServices.php @@ -84,7 +84,7 @@ class SystemRouteServices extends BaseServices */ public function getTreeList(string $appName = 'adminapi', string $name = '') { -// return $this->cacheDriver()->remember('ROUTE_LIST' . strtoupper($appName), function () use ($name, $appName) { + return $this->cacheDriver()->remember('ROUTE_LIST' . strtoupper($appName), function () use ($name, $appName) { $list = app()->make(SystemRouteCateServices::class) ->selectList(['app_name' => $appName], '*', 0, 0, 'id asc,sort desc', [ 'children' => function ($query) use ($name, $appName) { @@ -110,7 +110,7 @@ class SystemRouteServices extends BaseServices } } return get_tree_children($list); -// }, 600); + }, 600); } /** @@ -201,6 +201,9 @@ class SystemRouteServices extends BaseServices { $oneId = app()->make(SystemRouteCateServices::class)->value(['app_name' => $app, 'name' => $cateName, 'pid' => 0], 'id'); if (!$oneId) { + //修复重复同步后反复增加二级文件夹 + $id = app()->make(SystemRouteCateServices::class)->value(['app_name' => $app, 'name' => $cateName, 'pid' => $pid], 'id'); + if ($id) return $id; $res = app()->make(SystemRouteCateServices::class)->save([ 'app_name' => $app, 'name' => $cateName, diff --git a/crmeb/app/services/wechat/WechatServices.php b/crmeb/app/services/wechat/WechatServices.php index a1f83786d..e79af86dc 100644 --- a/crmeb/app/services/wechat/WechatServices.php +++ b/crmeb/app/services/wechat/WechatServices.php @@ -395,8 +395,7 @@ class WechatServices extends BaseServices if (!$uid && !$res) { return false; } - } - if ($openid && $storeUserMobile) { + } elseif ($openid && $storeUserMobile) { /** @var UserServices $userServices */ $userServices = app()->make(UserServices::class); $uid = $this->dao->value(['openid' => $openid], 'uid');