From d0202a70bfd2cf1acb855cbf5985112144201152 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 10 Oct 2023 11:34:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=EF=BC=9A=E5=8F=AF=E4=BB=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BA=E7=94=B2=E6=96=B9=E7=AD=BE=E7=BA=A6=E7=9A=84=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/setting/dict/DictDataController.php | 6 ++++++
 app/adminapi/logic/setting/dict/DictDataLogic.php           | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/controller/setting/dict/DictDataController.php b/app/adminapi/controller/setting/dict/DictDataController.php
index c9d12851f..294dd2fb8 100755
--- a/app/adminapi/controller/setting/dict/DictDataController.php
+++ b/app/adminapi/controller/setting/dict/DictDataController.php
@@ -95,5 +95,11 @@ class DictDataController extends BaseAdminController
         return $this->data($result);
     }
 
+    public function getContractPartyACompanyTypeList()
+    {
+        $result = DictDataLogic::getContractPartyACompanyTypeList();
+        return $this->data($result);
+    }
+
 
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/setting/dict/DictDataLogic.php b/app/adminapi/logic/setting/dict/DictDataLogic.php
index 8ea5d934b..13cd58918 100755
--- a/app/adminapi/logic/setting/dict/DictDataLogic.php
+++ b/app/adminapi/logic/setting/dict/DictDataLogic.php
@@ -80,5 +80,8 @@ class DictDataLogic extends BaseLogic
         return DictData::findOrEmpty($params['id'])->toArray();
     }
 
-
+    public static function getContractPartyACompanyTypeList()
+    {
+        return DictData::whereIn('id', [30,16,41])->select('id', 'name')->order('sort')->get()->toArray();
+    }
 }
\ No newline at end of file

From 193f4fc49b45d411169e307c41142e42b014d665 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 10 Oct 2023 11:55:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=EF=BC=9A=E5=8F=AF=E4=BB=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BA=E7=94=B2=E6=96=B9=E7=AD=BE=E7=BA=A6=E7=9A=84=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/setting/dict/DictDataLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/adminapi/logic/setting/dict/DictDataLogic.php b/app/adminapi/logic/setting/dict/DictDataLogic.php
index 13cd58918..f537493aa 100755
--- a/app/adminapi/logic/setting/dict/DictDataLogic.php
+++ b/app/adminapi/logic/setting/dict/DictDataLogic.php
@@ -82,6 +82,6 @@ class DictDataLogic extends BaseLogic
 
     public static function getContractPartyACompanyTypeList()
     {
-        return DictData::whereIn('id', [30,16,41])->select('id', 'name')->order('sort')->get()->toArray();
+        return DictData::whereIn('id', [30,16,41])->order('sort')->select()->toArray();
     }
 }
\ No newline at end of file