diff --git a/app/common/controller/FinPaymentApplyController.php b/app/common/controller/FinPaymentApplyController.php index 8739043..7dead81 100644 --- a/app/common/controller/FinPaymentApplyController.php +++ b/app/common/controller/FinPaymentApplyController.php @@ -33,9 +33,9 @@ class FinPaymentApplyController extends BaseController protected function indexFormat($data) { if (isset($data['doc_user_id'])) //内勤 - $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; + $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??''; if (isset($data['sales_user_id'])) //业务员 - $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; + $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??''; if (isset($data['corp_id'])) //公司(渠道) $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??''; if (isset($data['account_id'])) //收款账号 @@ -76,9 +76,9 @@ class FinPaymentApplyController extends BaseController protected function showFormat($data) { if (isset($data['doc_user_id'])) //内勤 - $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; + $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??''; if (isset($data['sales_user_id'])) //业务员 - $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; + $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??''; if (isset($data['corp_id'])) //公司(渠道) $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??''; if (isset($data['account_id'])) //收款账号 diff --git a/app/common/controller/FinReceiptHisController.php b/app/common/controller/FinReceiptHisController.php index eb57d99..e10d859 100644 --- a/app/common/controller/FinReceiptHisController.php +++ b/app/common/controller/FinReceiptHisController.php @@ -5,6 +5,7 @@ use app\common\controller\BaseController; use app\common\model\Country; use app\common\model\SysAccount; use app\common\model\SysCurrency; +use app\common\model\User; use app\common\service\OssService; use app\common\traits\crud\CrudControllerTrait; use app\common\service\FinReceiptHisService; @@ -45,6 +46,11 @@ class FinReceiptHisController extends BaseController $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name; if (isset($data['fx_receipt_file'])) $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); + + if (isset($data['created_by'])) + $data['created_by'] = User::where('id', $data['created_by'])->value('name')??''; + if (isset($data['updated_by'])) + $data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??''; return $data; } @@ -72,6 +78,11 @@ class FinReceiptHisController extends BaseController $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name; if (isset($data['fx_receipt_file'])) $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); + + if (isset($data['created_by'])) + $data['created_by'] = User::where('id', $data['created_by'])->value('name')??''; + if (isset($data['updated_by'])) + $data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??''; return $data; } } \ No newline at end of file