From b9f55f007aa06412ca40f3732ef56c5fc7a89637 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 2 Mar 2024 16:20:43 +0800
Subject: [PATCH] update
---
.../logic/supervision_work/SupervisionWitnessSamplingLogic.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
index 710f99aca..e3a375a37 100644
--- a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
+++ b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
@@ -152,11 +152,12 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
{
$data = SupervisionWitnessSampling::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
- $material_entry = SupervisionMaterialEntry::field('company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
+ $material_entry = SupervisionMaterialEntry::field('theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
+ $data['theme'] = $material_entry['theme'];
$data['enter_time'] = $material_entry['enter_time'];
$data['create_user_name'] = $create_user['name'];
return $data->toArray();