From 3ad05165bd5479c92f05ed32a074d2d8ff9c3178 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Fri, 12 Sep 2025 14:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=A2=9E=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E5=BD=92=E5=B1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/SysAccountController.php |  9 +++++++--
 app/admin/validate/SysAccountValidate.php     | 10 ++++++----
 app/common/model/SysAccount.php               |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/SysAccountController.php b/app/admin/controller/SysAccountController.php
index aa4b132..9343a84 100644
--- a/app/admin/controller/SysAccountController.php
+++ b/app/admin/controller/SysAccountController.php
@@ -2,6 +2,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\BaseController;
+use app\common\model\Corp;
 use app\common\model\SysCurrency;
 use app\common\traits\crud\CrudControllerTrait;
 use app\admin\service\SysAccountService;
@@ -30,8 +31,10 @@ class SysAccountController extends BaseController
              $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
          if (isset($data['updated_at']))
              $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
-         if (isset($data['currency_name']))
+         if (isset($data['currency_id']) && $data['currency_id'])
              $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name');
+         if (isset($data['corp_id']) && $data['corp_id'])
+             $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
          return $data;
      }
 
@@ -47,8 +50,10 @@ class SysAccountController extends BaseController
             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
         if (isset($data['updated_at']))
             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
-        if (isset($data['currency_name']))
+        if (isset($data['currency_id']))
             $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name');
+        if (isset($data['corp_id']) && $data['corp_id'])
+            $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
         return $data;
     }
 }
\ No newline at end of file
diff --git a/app/admin/validate/SysAccountValidate.php b/app/admin/validate/SysAccountValidate.php
index 65cc1d7..093ebb1 100644
--- a/app/admin/validate/SysAccountValidate.php
+++ b/app/admin/validate/SysAccountValidate.php
@@ -8,22 +8,24 @@ class SysAccountValidate extends Validate
 {
     // 规则
     protected $rule = [
-        
+        'corp_id'     => 'require|integer|gt:0',
     ];
 
     // 提示
     protected $message = [
-        
+        'corp_id.require'        => 'ID不能为空',
+        'corp_id.integer'        => 'ID必须是整数',
+        'corp_id.gt'            => 'ID必须大于0',
     ];
 
     // 场景
     protected $scene = [
         'store' => [
-            
+            'corp_id'
         ],
 
         'update' => [
-            
+            'corp_id'
         ]
     ];
 }
\ No newline at end of file
diff --git a/app/common/model/SysAccount.php b/app/common/model/SysAccount.php
index 693e823..92d660b 100644
--- a/app/common/model/SysAccount.php
+++ b/app/common/model/SysAccount.php
@@ -40,7 +40,7 @@ class SysAccount extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'currency_id', 'account_name', 'account_number', 'account_holder', 'bank_name', 'bank_branch', 'daily_limit', 'single_limit', 'description', 'status', 'sort', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'corp_id', 'currency_id', 'account_name', 'account_number', 'account_holder', 'bank_name', 'bank_branch', 'daily_limit', 'single_limit', 'description', 'status', 'sort', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段