From 8c137736cd8d20289111be4dc3d0a8b189371b2b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 24 May 2024 15:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/MyBusinessException.php              | 2 +-
 app/admin/controller/LoginController.php | 1 +
 app/admin/logic/LoginLogic.php           | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/MyBusinessException.php b/app/MyBusinessException.php
index 41da0fe..bebfa4e 100644
--- a/app/MyBusinessException.php
+++ b/app/MyBusinessException.php
@@ -12,7 +12,7 @@ class MyBusinessException extends BusinessException
     {
         // json请求返回json数据
         if ($request->expectsJson()) {
-            return json(['code' => $this->getCode() ?: 500, 'message' => $this->getMessage(),'show'=>1]);
+            return json(['code' => $this->getCode() ?: 500, 'msg' => $this->getMessage(),'show'=>1]);
         }
         // 非json请求则返回一个页面
         return new Response(200, [], $this->getMessage());
diff --git a/app/admin/controller/LoginController.php b/app/admin/controller/LoginController.php
index 01b37fd..9964d32 100755
--- a/app/admin/controller/LoginController.php
+++ b/app/admin/controller/LoginController.php
@@ -38,6 +38,7 @@ class LoginController extends BaseAdminController
     public function account()
     {
         $params = (new LoginValidate())->post()->goCheck();
+        $params['is_admin']=$this->request->post('is_admin',1);
         return $this->data((new LoginLogic())->login($params));
     }
 
diff --git a/app/admin/logic/LoginLogic.php b/app/admin/logic/LoginLogic.php
index 5aaac01..0907938 100755
--- a/app/admin/logic/LoginLogic.php
+++ b/app/admin/logic/LoginLogic.php
@@ -17,6 +17,7 @@ namespace app\admin\logic;
 use app\common\logic\BaseLogic;
 use app\common\model\auth\Admin;
 use app\admin\service\AdminTokenService;
+use app\common\model\auth\AdminRole;
 use app\common\service\FileService;
 use app\MyBusinessException;
 use think\facade\Db;
@@ -43,12 +44,16 @@ class LoginLogic extends BaseLogic
     {
         $time = time();
         $admin = Admin::where('account', '=', $params['account'])->find();
-        if(isset($params['is_admin']) &&$params['is_admin'] == 0 &&$admin){
+        if($params['is_admin'] == 0 &&$admin){
             $auth_shop=Db::name('user_auth_shop')->where(['admin_id'=>$admin['id'],'status'=>1,'apply_status'=>1,'type'=>2])->find();
             if(!$auth_shop){
                 throw new MyBusinessException('该账户没有权限');
             }
         }
+        if($admin &&$params['is_admin'] == 1){
+            $role_find=AdminRole::where('admin_id',$admin['id'])->where('role_id',1)->find();
+            if($role_find) throw new MyBusinessException('请使用供应商后台登录');
+        }
         //用户表登录信息更新
         $admin->login_time = $time;
         $admin->login_ip = request()->getLocalIp();