From 4711c88013ebc883d143fb6e31eec4fc7d322ed6 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Mon, 15 Jan 2024 09:30:15 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/cost/CostSubjectLists.php |  4 ++--
 app/adminapi/logic/cost/CostSubjectLogic.php | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/adminapi/lists/cost/CostSubjectLists.php b/app/adminapi/lists/cost/CostSubjectLists.php
index 8d5323538..d4e81703b 100644
--- a/app/adminapi/lists/cost/CostSubjectLists.php
+++ b/app/adminapi/lists/cost/CostSubjectLists.php
@@ -15,7 +15,7 @@
 namespace app\adminapi\lists\cost;
 
 
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\cost\CostSubject;
 use app\common\lists\ListsSearchInterface;
 
@@ -38,7 +38,7 @@ class CostSubjectLists extends BaseAdminDataLists implements ListsSearchInterfac
     public function setSearch(): array
     {
         return [
-            '=' => ['sn', 'subject1'],
+            '%like%' => ['sn', 'subject1', 'subject12'],
         ];
     }
 
diff --git a/app/adminapi/logic/cost/CostSubjectLogic.php b/app/adminapi/logic/cost/CostSubjectLogic.php
index 593d2378d..4036e17c7 100644
--- a/app/adminapi/logic/cost/CostSubjectLogic.php
+++ b/app/adminapi/logic/cost/CostSubjectLogic.php
@@ -41,11 +41,10 @@ class CostSubjectLogic extends BaseLogic
         Db::startTrans();
         try {
             CostSubject::create([
-                'sn' => $params['sn'],
-                'subject1' => $params['subject1'],
-                'subject2' => $params['subject2'],
+                'sn' => $params['sn'],
+                'subject1' => $params['subject1'],
+                'subject2' => $params['subject2'] ?? '',
             ]);
-
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -68,11 +67,11 @@ class CostSubjectLogic extends BaseLogic
         Db::startTrans();
         try {
             CostSubject::where('id', $params['id'])->update([
-                'sn' => $params['sn'],
-                'subject1' => $params['subject1'],
-                'subject2' => $params['subject2'],
+                'sn' => $params['sn'],
+                'subject1' => $params['subject1'],
+                'subject2' => $params['subject2'] ?? '',
+	            'update_time' => time()
             ]);
-
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -105,6 +104,6 @@ class CostSubjectLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return CostSubject::findOrEmpty($params['id'])->toArray();
+        return CostSubject::field('id,sn,subject1,subject2')->findOrEmpty($params['id'])->toArray();
     }
 }
\ No newline at end of file