From 98ea371089ae96dc5bd906a126ac8c917103183c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 22 Jul 2023 00:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/auth/AdminController.php | 1 +
 app/adminapi/logic/CompanyLogic.php              | 4 ++--
 app/adminapi/logic/auth/AdminLogic.php           | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/adminapi/controller/auth/AdminController.php b/app/adminapi/controller/auth/AdminController.php
index 1f8a84efc..b3aff6ae9 100755
--- a/app/adminapi/controller/auth/AdminController.php
+++ b/app/adminapi/controller/auth/AdminController.php
@@ -86,6 +86,7 @@ class AdminController extends BaseAdminController
     public function edit()
     {
         $params = (new AdminValidate())->post()->goCheck('edit');
+        $params['qualification'] = json_encode($params['qualification']);
         $result = AdminLogic::edit($params);
         if (true === $result) {
             return $this->success('操作成功', [], 1, 1);
diff --git a/app/adminapi/logic/CompanyLogic.php b/app/adminapi/logic/CompanyLogic.php
index 92cf62ec0..5afc32b0b 100644
--- a/app/adminapi/logic/CompanyLogic.php
+++ b/app/adminapi/logic/CompanyLogic.php
@@ -62,7 +62,7 @@ class CompanyLogic extends BaseLogic
                 'master_phone' => $params['master_phone'],
                 'master_email' => $params['master_email'],
                 'other_contacts' => $params['other_contacts'],
-                'area_manager' => $params['area_manager'],
+                'area_manager' => $params['area_manager']??0,
                 // 'is_contract' => $params['is_contract'],
                 // 'account' => $params['account'],
                 // 'password' => $params['password'],
@@ -111,7 +111,7 @@ class CompanyLogic extends BaseLogic
                 'master_phone' => $params['master_phone'],
                 'master_email' => $params['master_email'],
                 'other_contacts' => $params['other_contacts'],
-                'area_manager' => $params['area_manager'],
+                'area_manager' => $params['area_manager']??0,
                 // 'is_contract' => $params['is_contract'],
                 // 'account' => $params['account'],
                 // 'password' => $params['password'],
diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 993a0a3c2..6bff97c38 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -87,7 +87,7 @@ class AdminLogic extends BaseLogic
         Db::startTrans();
         try {
             // 基础信息
-
+            $role_id_arr=explode(',',$params['role_id']) ?? [];
             $data=$params;
             // 头像
             $data['avatar'] = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : '';
@@ -101,7 +101,7 @@ class AdminLogic extends BaseLogic
             // 禁用或更换角色后.设置token过期
             $roleId = AdminRole::where('admin_id', $params['id'])->column('role_id');
             $editRole = false;
-            if (!empty(array_diff_assoc($roleId, $params['role_id']))) {
+            if (!empty(array_diff_assoc($roleId, $role_id_arr))) {
                 $editRole = true;
             }
 
@@ -111,7 +111,6 @@ class AdminLogic extends BaseLogic
                     self::expireToken($token['token']);
                 }
             }
-
             Admin::strict(false)->update($data);
             (new AdminAuthCache($params['id']))->clearAuthCache();
 
@@ -120,7 +119,7 @@ class AdminLogic extends BaseLogic
             AdminDept::delByUserId($params['id']);
             AdminJobs::delByUserId($params['id']);
             // 角色
-            self::insertRole($params['id'], explode(',',$params['role_id']) ?? []);
+            self::insertRole($params['id'], $role_id_arr);
             self::contract($params['id'], $params);
             // 部门
             // self::insertDept($params['id'], $params['dept_id'] ?? []);