From 31d2d6a472fed2b44ad3a106abc2a5a4fa4b3f55 Mon Sep 17 00:00:00 2001
From: JXDN <2749143951@qq.com>
Date: Sat, 21 Sep 2024 00:07:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96update=E5=86=99?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/api/logic/ArticleLogic.php                  |  3 +--
 server/app/api/logic/UserLogic.php                     | 10 +++-------
 server/app/common/command/QueryRefund.php              |  9 +++------
 server/app/common/logic/RefundLogic.php                |  9 +++------
 server/app/platformapi/logic/auth/AdminLogic.php       |  6 ++----
 server/app/platformapi/logic/auth/MenuLogic.php        |  6 ++----
 server/app/platformapi/logic/auth/RoleLogic.php        |  3 +--
 server/app/platformapi/logic/crontab/CrontabLogic.php  |  2 +-
 server/app/platformapi/logic/dept/DeptLogic.php        |  3 +--
 server/app/platformapi/logic/dept/JobsLogic.php        |  3 +--
 .../platformapi/logic/setting/dict/DictTypeLogic.php   |  3 +--
 .../app/platformapi/logic/tenant/TenantAdminLogic.php  |  3 +--
 server/app/platformapi/logic/tenant/TenantLogic.php    |  3 +--
 server/app/platformapi/logic/tools/GeneratorLogic.php  |  6 ++----
 14 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/server/app/api/logic/ArticleLogic.php b/server/app/api/logic/ArticleLogic.php
index 693fa54d..a6c6f8c5 100644
--- a/server/app/api/logic/ArticleLogic.php
+++ b/server/app/api/logic/ArticleLogic.php
@@ -67,9 +67,8 @@ class ArticleLogic extends BaseLogic
             ]);
         } else {
             ArticleCollect::update([
-                'id' => $collect['id'],
                 'status' => YesNoEnum::YES
-            ]);
+            ], ['id' => $collect['id']]);
         }
     }
 
diff --git a/server/app/api/logic/UserLogic.php b/server/app/api/logic/UserLogic.php
index ef60c5eb..0948574f 100644
--- a/server/app/api/logic/UserLogic.php
+++ b/server/app/api/logic/UserLogic.php
@@ -96,9 +96,7 @@ class UserLogic extends BaseLogic
                 $params['value'] = FileService::setFileUrl($params['value']);
             }
 
-            return User::update([
-                    'id' => $userId,
-                    $params['field'] => $params['value']]
+            return User::update([$params['field'] => $params['value'], ['id' => $userId]]
             );
         } catch (\Exception $e) {
             self::$error = $e->getMessage();
@@ -228,9 +226,8 @@ class UserLogic extends BaseLogic
 
             // 绑定手机号
             User::update([
-                'id' => $params['user_id'],
                 'mobile' => $phoneNumber
-            ]);
+            ], ['id' => $params['user_id']]);
 
             return true;
         } catch (\Exception $e) {
@@ -277,9 +274,8 @@ class UserLogic extends BaseLogic
             }
 
             User::update([
-                'id' => $params['user_id'],
                 'mobile' => $params['mobile'],
-            ]);
+            ], ['id' => $params['user_id']]);
 
             return true;
         } catch (\Exception $e) {
diff --git a/server/app/common/command/QueryRefund.php b/server/app/common/command/QueryRefund.php
index 42fab38a..ebeb13f6 100644
--- a/server/app/common/command/QueryRefund.php
+++ b/server/app/common/command/QueryRefund.php
@@ -172,14 +172,12 @@ class QueryRefund extends Command
     {
         // 更新日志
         RefundLog::update([
-            'id' => $logId,
             'refund_status' => RefundEnum::REFUND_SUCCESS,
-        ]);
+        ], ['id' => $logId]);
         // 更新记录
         RefundRecord::update([
-            'id' => $recordId,
             'refund_status' => RefundEnum::REFUND_SUCCESS,
-        ]);
+        ], ['id' => $recordId]);
     }
 
 
@@ -194,9 +192,8 @@ class QueryRefund extends Command
     {
         // 更新日志
         RefundLog::update([
-            'id' => $logId,
             'refund_msg' => $msg,
-        ]);
+        ], ['id' => $logId]);
     }
 
 }
\ No newline at end of file
diff --git a/server/app/common/logic/RefundLogic.php b/server/app/common/logic/RefundLogic.php
index e16c2343..98f913b9 100644
--- a/server/app/common/logic/RefundLogic.php
+++ b/server/app/common/logic/RefundLogic.php
@@ -149,9 +149,8 @@ class RefundLogic extends BaseLogic
             // 更新订单信息
             if ($refundRecord['order_type'] == 'recharge') {
                 RechargeOrder::update([
-                    'id' => $refundRecord['order_id'],
                     'refund_transaction_id' => $result['tradeNo'] ?? '',
-                ]);
+                ], ['id' => $refundRecord['order_id']]);
             }
         }
     }
@@ -168,17 +167,15 @@ class RefundLogic extends BaseLogic
     {
         // 更新退款日志记录
         RefundLog::update([
-            'id' => self::$refundLog['id'],
             'refund_status' => RefundEnum::REFUND_ERROR,
             'refund_msg' => $msg,
-        ]);
+        ], ['id' => self::$refundLog['id']]);
 
         //  更新退款记录状态为退款失败
         RefundRecord::update([
-            'id' => $refundRecordId,
             'refund_status' => RefundEnum::REFUND_ERROR,
             'refund_msg' => $msg,
-        ]);
+        ], ['id' => $refundRecordId]);
     }
 
 
diff --git a/server/app/platformapi/logic/auth/AdminLogic.php b/server/app/platformapi/logic/auth/AdminLogic.php
index 30db7215..120f05ba 100644
--- a/server/app/platformapi/logic/auth/AdminLogic.php
+++ b/server/app/platformapi/logic/auth/AdminLogic.php
@@ -90,7 +90,6 @@ class AdminLogic extends BaseLogic
         try {
             // 基础信息
             $data = [
-                'id' => $params['id'],
                 'name' => $params['name'],
                 'account' => $params['account'],
                 'disable' => $params['disable'],
@@ -120,7 +119,7 @@ class AdminLogic extends BaseLogic
                 }
             }
 
-            Admin::update($data);
+            Admin::update($data, ['id' => $params['id']]);
             (new AdminAuthCache($params['id']))->clearAuthCache();
 
             // 删除旧的关联信息
@@ -249,7 +248,6 @@ class AdminLogic extends BaseLogic
     public static function editSelf($params)
     {
         $data = [
-            'id' => $params['admin_id'],
             'name' => $params['name'],
             'avatar' => FileService::setFileUrl($params['avatar']),
         ];
@@ -259,7 +257,7 @@ class AdminLogic extends BaseLogic
             $data['password'] = create_password($params['password'], $passwordSalt);
         }
 
-        return Admin::update($data);
+        return Admin::update($data, ['id' => $params['admin_id']]);
     }
 
 
diff --git a/server/app/platformapi/logic/auth/MenuLogic.php b/server/app/platformapi/logic/auth/MenuLogic.php
index b201f312..c28b2832 100644
--- a/server/app/platformapi/logic/auth/MenuLogic.php
+++ b/server/app/platformapi/logic/auth/MenuLogic.php
@@ -99,7 +99,6 @@ class MenuLogic extends BaseLogic
     public static function edit(array $params)
     {
         return SystemMenu::update([
-            'id' => $params['id'],
             'pid' => $params['pid'],
             'type' => $params['type'],
             'name' => $params['name'],
@@ -113,7 +112,7 @@ class MenuLogic extends BaseLogic
             'is_cache' => $params['is_cache'],
             'is_show' => $params['is_show'],
             'is_disable' => $params['is_disable'],
-        ]);
+        ], ['id' => $params['id']]);
     }
 
 
@@ -155,9 +154,8 @@ class MenuLogic extends BaseLogic
     public static function updateStatus(array $params)
     {
         return SystemMenu::update([
-            'id' => $params['id'],
             'is_disable' => $params['is_disable']
-        ]);
+        ], ['id' => $params['id']]);
     }
 
 
diff --git a/server/app/platformapi/logic/auth/RoleLogic.php b/server/app/platformapi/logic/auth/RoleLogic.php
index e6aa98df..252f0824 100644
--- a/server/app/platformapi/logic/auth/RoleLogic.php
+++ b/server/app/platformapi/logic/auth/RoleLogic.php
@@ -84,11 +84,10 @@ class RoleLogic extends BaseLogic
             $menuId = !empty($params['menu_id']) ? $params['menu_id'] : [];
 
             SystemRole::update([
-                'id' => $params['id'],
                 'name' => $params['name'],
                 'desc' => $params['desc'] ?? '',
                 'sort' => $params['sort'] ?? 0,
-            ]);
+            ], ['id' => $params['id']]);
 
             if (!empty($menuId)) {
                 SystemRoleMenu::where(['role_id' => $params['id']])->delete();
diff --git a/server/app/platformapi/logic/crontab/CrontabLogic.php b/server/app/platformapi/logic/crontab/CrontabLogic.php
index 995e55d1..a315c59b 100644
--- a/server/app/platformapi/logic/crontab/CrontabLogic.php
+++ b/server/app/platformapi/logic/crontab/CrontabLogic.php
@@ -80,7 +80,7 @@ class CrontabLogic extends BaseLogic
             $params['remark'] = $params['remark'] ?? '';
             $params['params'] = $params['params'] ?? '';
 
-            Crontab::update($params);
+            Crontab::update($params, ['id' => $params['id']]);
 
             return true;
         } catch (\Exception $e) {
diff --git a/server/app/platformapi/logic/dept/DeptLogic.php b/server/app/platformapi/logic/dept/DeptLogic.php
index 5c516c82..5690a26e 100644
--- a/server/app/platformapi/logic/dept/DeptLogic.php
+++ b/server/app/platformapi/logic/dept/DeptLogic.php
@@ -139,14 +139,13 @@ class DeptLogic extends BaseLogic
             }
 
             Dept::update([
-                'id'     => $params['id'],
                 'pid'    => $pid,
                 'name'   => $params['name'],
                 'leader' => $params['leader'] ?? '',
                 'mobile' => $params['mobile'] ?? '',
                 'status' => $params['status'],
                 'sort'   => $params['sort'] ?? 0
-            ]);
+            ], ['id'     => $params['id']]);
             return true;
         } catch (\Exception $e) {
             self::setError($e->getMessage());
diff --git a/server/app/platformapi/logic/dept/JobsLogic.php b/server/app/platformapi/logic/dept/JobsLogic.php
index a0df0f80..611ad2b0 100644
--- a/server/app/platformapi/logic/dept/JobsLogic.php
+++ b/server/app/platformapi/logic/dept/JobsLogic.php
@@ -60,13 +60,12 @@ class JobsLogic extends BaseLogic
     {
         try {
             Jobs::update([
-                'id' => $params['id'],
                 'name' => $params['name'],
                 'code' => $params['code'],
                 'sort' => $params['sort'] ?? 0,
                 'status' => $params['status'],
                 'remark' => $params['remark'] ?? '',
-            ]);
+            ], ['id' => $params['id']]);
             return true;
         } catch (\Exception $e) {
             self::setError($e->getMessage());
diff --git a/server/app/platformapi/logic/setting/dict/DictTypeLogic.php b/server/app/platformapi/logic/setting/dict/DictTypeLogic.php
index 3e3dcd1d..2835d9f8 100644
--- a/server/app/platformapi/logic/setting/dict/DictTypeLogic.php
+++ b/server/app/platformapi/logic/setting/dict/DictTypeLogic.php
@@ -55,12 +55,11 @@ class DictTypeLogic extends BaseLogic
     public static function edit(array $params)
     {
          DictType::update([
-            'id' => $params['id'],
             'name' => $params['name'],
             'type' => $params['type'],
             'status' => $params['status'],
             'remark' => $params['remark'] ?? '',
-        ]);
+        ], ['id' => $params['id']]);
 
          DictData::where(['type_id' => $params['id']])
              ->update(['type_value' => $params['type']]);
diff --git a/server/app/platformapi/logic/tenant/TenantAdminLogic.php b/server/app/platformapi/logic/tenant/TenantAdminLogic.php
index fc901bf9..68b37f55 100644
--- a/server/app/platformapi/logic/tenant/TenantAdminLogic.php
+++ b/server/app/platformapi/logic/tenant/TenantAdminLogic.php
@@ -109,7 +109,6 @@ class TenantAdminLogic extends BaseLogic
         try {
             // 基础信息
             $data = [
-                'id'               => $params['id'],
                 'name'             => $params['name'],
                 'account'          => $params['account'],
                 'disable'          => $params['disable'],
@@ -138,7 +137,7 @@ class TenantAdminLogic extends BaseLogic
                     self::expireToken($token['token']);
                 }
             }
-            TenantAdmin::update($data);
+            TenantAdmin::update($data, ['id' => $params['id']]);
             (new TenantAdminAuthCache($params['id']))->clearAuthCache();
 
             // 删除旧的关联信息
diff --git a/server/app/platformapi/logic/tenant/TenantLogic.php b/server/app/platformapi/logic/tenant/TenantLogic.php
index 22351e6e..8f666801 100644
--- a/server/app/platformapi/logic/tenant/TenantLogic.php
+++ b/server/app/platformapi/logic/tenant/TenantLogic.php
@@ -90,7 +90,6 @@ class TenantLogic extends BaseLogic
         try {
             $domain_alias = preg_replace('/^https?:\/\/|\/$/', '', $params['domain_alias']);
             Tenant::update([
-                'id'                  => $params['id'],
                 'name'                => $params['name'],
                 'avatar'              => $params['avatar'],
                 'disable'             => $params['disable'] ?? 0,
@@ -98,7 +97,7 @@ class TenantLogic extends BaseLogic
                 'domain_alias'        => $domain_alias,
                 'domain_alias_enable' => $params['domain_alias_enable'],
                 'notes'               => $params['notes'] ?? '',
-            ]);
+            ], ['id' => $params['id']]);
             return true;
         } catch (\Exception $e) {
             self::setError($e->getMessage());
diff --git a/server/app/platformapi/logic/tools/GeneratorLogic.php b/server/app/platformapi/logic/tools/GeneratorLogic.php
index 346fea84..58e92c33 100644
--- a/server/app/platformapi/logic/tools/GeneratorLogic.php
+++ b/server/app/platformapi/logic/tools/GeneratorLogic.php
@@ -97,7 +97,6 @@ class GeneratorLogic extends BaseLogic
             $options = self::formatConfigByTableData($params);
             // 更新主表-数据表信息
             GenerateTable::update([
-                'id' => $params['id'],
                 'table_name' => $params['table_name'],
                 'table_comment' => $params['table_comment'],
                 'template_type' => $params['template_type'],
@@ -111,12 +110,11 @@ class GeneratorLogic extends BaseLogic
                 'delete' => $options['delete'],
                 'tree' => $options['tree'],
                 'relations' => $options['relations'],
-            ]);
+            ], ['id' => $params['id']]);
 
             // 更新从表-数据表字段信息
             foreach ($params['table_column'] as $item) {
                 GenerateColumn::update([
-                    'id' => $item['id'],
                     'column_comment' => $item['column_comment'] ?? '',
                     'is_required' => $item['is_required'] ?? 0,
                     'is_insert' => $item['is_insert'] ?? 0,
@@ -126,7 +124,7 @@ class GeneratorLogic extends BaseLogic
                     'query_type' => $item['query_type'],
                     'view_type' => $item['view_type'],
                     'dict_type' => $item['dict_type'] ?? '',
-                ]);
+                ], ['id' => $item['id']]);
             }
             Db::commit();
             return true;