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']; /** * 不允许自动填充模型字段