From 382653c388508fad933b4d7ceb41179bef542cff Mon Sep 17 00:00:00 2001
From: wh <382379437@qq.com>
Date: Fri, 28 Mar 2025 09:42:21 +0800
Subject: [PATCH] fixed

---
 .../admin/controller/Firmstoreprojectstwo.php   | 17 +++++++++++++++++
 .../admin/view/firmcustomer/add.html            |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/admin/application/admin/controller/Firmstoreprojectstwo.php b/admin/application/admin/controller/Firmstoreprojectstwo.php
index ebf8b6d..8072913 100755
--- a/admin/application/admin/controller/Firmstoreprojectstwo.php
+++ b/admin/application/admin/controller/Firmstoreprojectstwo.php
@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
 
 /**
  * 店铺二级项目
@@ -11,6 +12,7 @@ use app\common\controller\Backend;
  */
 class Firmstoreprojectstwo extends Backend
 {
+    protected $noNeedRight = ['firmstoreprojectstwoGetList'];
 
     /**
      * Firmstoreprojectstwo模型对象
@@ -71,4 +73,19 @@ class Firmstoreprojectstwo extends Backend
         return $this->view->fetch();
     }
 
+
+    function firmstoreprojectstwoGetList(){
+
+        $data = Db::table('fa_firmstoreprojectstwo')
+            ->where('firm_id',session_admin_firm_id())
+            ->select();
+
+        foreach ($data as $k => &$item){
+            $name_one = Db::table('fa_firmstoreprojectsone')
+                ->where('id',$item['firmstoreprojectsone_id'])
+                ->value('name');
+            $item['name'] = $name_one .' - '.$item['name'];
+        }
+        return json(['list' => $data, 'total' => count($data)]);
+    }
 }
diff --git a/admin/application/admin/view/firmcustomer/add.html b/admin/application/admin/view/firmcustomer/add.html
index 6c0285f..83115b1 100755
--- a/admin/application/admin/view/firmcustomer/add.html
+++ b/admin/application/admin/view/firmcustomer/add.html
@@ -94,7 +94,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Firmstoreprojectstwo_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-firmstoreprojectstwo_id" min="0" data-rule="required" data-source="firmstoreprojectstwo/index" class="form-control selectpage" name="row[firmstoreprojectstwo_id]" type="text" value="">
+            <input id="c-firmstoreprojectstwo_id" min="0" data-rule="required" data-source="firmstoreprojectstwo/firmstoreprojectstwoGetList" class="form-control selectpage" name="row[firmstoreprojectstwo_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">