From 4bd48669d6917c2e3e164199ee7ef51eb4a0c1bb Mon Sep 17 00:00:00 2001
From: wh <382379437@qq.com>
Date: Sat, 22 Mar 2025 22:54:38 +0800
Subject: [PATCH] update

---
 admin/application/admin/controller/Firmstoreprojectstwo.php | 4 ++--
 admin/application/admin/view/firmemployee/edit.html         | 5 ++++-
 admin/application/admin/view/firmfollowuptemplate/add.html  | 2 +-
 admin/application/admin/view/firmfollowuptemplate/edit.html | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/admin/application/admin/controller/Firmstoreprojectstwo.php b/admin/application/admin/controller/Firmstoreprojectstwo.php
index ab48622..9794611 100644
--- a/admin/application/admin/controller/Firmstoreprojectstwo.php
+++ b/admin/application/admin/controller/Firmstoreprojectstwo.php
@@ -22,8 +22,6 @@ class Firmstoreprojectstwo extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Firmstoreprojectstwo;
-        $this->model->where('firm_id',session_admin_firm_id());
-        $this->model->where('firmstore_id',session_admin_firmstore_id());
 
     }
 
@@ -52,6 +50,8 @@ class Firmstoreprojectstwo extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
+            $this->model->where('firmstoreprojectstwo.firm_id',session_admin_firm_id());
+            $this->model->where('firmstoreprojectstwo.firmstore_id',session_admin_firmstore_id());
             $list = $this->model
                     ->with(['firmstoreprojectsone'])
                     ->where($where)
diff --git a/admin/application/admin/view/firmemployee/edit.html b/admin/application/admin/view/firmemployee/edit.html
index 97d5ab7..bcc4b08 100644
--- a/admin/application/admin/view/firmemployee/edit.html
+++ b/admin/application/admin/view/firmemployee/edit.html
@@ -68,7 +68,10 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Firmstore_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-firmstore_id" min="0" data-rule="required" data-source="firmstore/index" class="form-control selectpage" name="row[firmstore_id]" type="text" value="{$row.firmstore_id|htmlentities}">
+            <input id="c-firmstore_id" min="0" data-rule="required"
+                   disabled
+                   data-source="firmstore/index" class="form-control selectpage"
+                   name="row[firmstore_id]" type="text" value="{$row.firmstore_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
diff --git a/admin/application/admin/view/firmfollowuptemplate/add.html b/admin/application/admin/view/firmfollowuptemplate/add.html
index 93032ea..d410983 100644
--- a/admin/application/admin/view/firmfollowuptemplate/add.html
+++ b/admin/application/admin/view/firmfollowuptemplate/add.html
@@ -51,7 +51,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Ai_text')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-ai_text" class="form-control" name="row[ai_text]" type="text" value="">
+            <textarea id="c-ai_text" class="form-control" name="row[ai_text]" type="text"></textarea>
         </div>
     </div>
     <div class="form-group">
diff --git a/admin/application/admin/view/firmfollowuptemplate/edit.html b/admin/application/admin/view/firmfollowuptemplate/edit.html
index 1d913ef..1f8d07a 100644
--- a/admin/application/admin/view/firmfollowuptemplate/edit.html
+++ b/admin/application/admin/view/firmfollowuptemplate/edit.html
@@ -47,7 +47,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Ai_text')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-ai_text" class="form-control" name="row[ai_text]" type="text" value="{$row.ai_text|htmlentities}">
+            <textarea id="c-ai_text" class="form-control" name="row[ai_text]" type="text">{$row.ai_text|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">