From 04fdb4b1ad79cd956eecfc816eafa4d87538bdc1 Mon Sep 17 00:00:00 2001
From: wh <382379437@qq.com>
Date: Thu, 27 Mar 2025 16:37:39 +0800
Subject: [PATCH] fixed

---
 .../admin/controller/auth/Admin.php           |  5 +-
 .../admin/view/auth/admin/add.html            | 49 ++++++++++++-------
 .../admin/view/auth/admin/edit.html           | 47 ++++++++++--------
 3 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/superadmin/application/admin/controller/auth/Admin.php b/superadmin/application/admin/controller/auth/Admin.php
index fd63ea7..512fa9b 100755
--- a/superadmin/application/admin/controller/auth/Admin.php
+++ b/superadmin/application/admin/controller/auth/Admin.php
@@ -28,7 +28,7 @@ class Admin extends Backend
     protected $searchFields = 'id,username,nickname';
     protected $childrenGroupIds = [];
     protected $childrenAdminIds = [];
-    protected $noNeedRight = ['index'];
+    protected $noNeedRight = ['index','getRelWxids','getAdminList'];
 
     public function _initialize()
     {
@@ -95,7 +95,8 @@ class Admin extends Backend
                 $adminGroupName[$this->auth->id][$n['id']] = $n['name'];
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+            $this->model->where('role','firm');
+            $this->model->where('firm_id',session_admin_firm_id());
             $list = $this->model
                 ->where($where)
                 ->where('id', 'in', $this->childrenAdminIds)
diff --git a/superadmin/application/admin/view/auth/admin/add.html b/superadmin/application/admin/view/auth/admin/add.html
index 6ea45b2..3788bce 100755
--- a/superadmin/application/admin/view/auth/admin/add.html
+++ b/superadmin/application/admin/view/auth/admin/add.html
@@ -17,23 +17,31 @@
                    name="row[firm_id]" type="text" value="{:session_admin_firm_id()}">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('选择门店')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-firmstore_id" min="0" data-rule="required"-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">AI客服:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-aicustomerservice_id" min="0" data-rule="required"
+                   data-source="aicustomerservice/index" class="form-control selectpage"
+                   name="row[aicustomerservice_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择门店')}:</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="{:session_admin_firmstore_id()}">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('职务')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-firmduty_id" min="0" data-rule="required"-->
-<!--                   data-source="firmduty/index" class="form-control selectpage"-->
-<!--                   name="row[firmduty_id]" type="text" value="">-->
-<!--        </div>-->
-<!--    </div>-->
+                   data-source="firmstore/index" class="form-control selectpage"
+                   name="row[firmstore_id]" type="text" value="{:session_admin_firmstore_id()}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('职务')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firmduty_id" min="0" data-rule="required"
+                   data-source="firmduty/index" class="form-control selectpage"
+                   name="row[firmduty_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group">
         <label for="username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -73,9 +81,12 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('关联微信')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-rel_wxid" min="0" data-rule="required"
-                   data-source="Gewechatfriends/getFriendList" class="form-control selectpage"
-                   name="row[rel_wxid]" type="text" >
+<!--            <input id="c-rel_wxid" min="0" data-rule="required"-->
+<!--                   data-source="Gewechatfriends/getFriendList" class="form-control selectpage"-->
+<!--                   name="row[rel_wxid]" type="text" >-->
+            <select id="c-rel_wxid" class="form-control" name="row[rel_wxid]">
+                <option value="">请选择</option>
+            </select>
         </div>
     </div>
     <div class="form-group">
diff --git a/superadmin/application/admin/view/auth/admin/edit.html b/superadmin/application/admin/view/auth/admin/edit.html
index ea394e4..7c415ed 100755
--- a/superadmin/application/admin/view/auth/admin/edit.html
+++ b/superadmin/application/admin/view/auth/admin/edit.html
@@ -1,6 +1,5 @@
 <form id="edit-form" class="form-horizontal form-ajax" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -18,23 +17,31 @@
                    name="row[firm_id]" type="text" value="{:session_admin_firm_id()}">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('选择门店')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-firmstore_id" min="0" data-rule="required"-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">AI客服:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-aicustomerservice_id" min="0" data-rule="required"
+                   data-source="aicustomerservice/index" class="form-control selectpage"
+                   name="row[aicustomerservice_id]" type="text" value="{$row.aicustomerservice_id}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择门店')}:</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="{:session_admin_firmstore_id()}">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('职务')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-firmduty_id" min="0" data-rule="required"-->
-<!--                   data-source="firmduty/index" class="form-control selectpage"-->
-<!--                   name="row[firmduty_id]" type="text" value="{$row.firmduty_id}">-->
-<!--        </div>-->
-<!--    </div>-->
+                   data-source="firmstore/index" class="form-control selectpage"
+                   name="row[firmstore_id]" type="text" value="{:session_admin_firmstore_id()}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('职务')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firmduty_id" min="0" data-rule="required"
+                   data-source="firmduty/index" class="form-control selectpage"
+                   name="row[firmduty_id]" type="text" value="{$row.firmduty_id}">
+        </div>
+    </div>
     <div class="form-group">
         <label for="username" class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -71,9 +78,9 @@
 <!--            <input id="c-rel_wxid" min="0" data-rule="required"-->
 <!--                   data-source="Gewechatfriends/getFriendList" class="form-control selectpage"-->
 <!--                   name="row[rel_wxid]" type="text" value="{$row.rel_wxid}">-->
-            <input id="c-rel_wxid" data-rule="required"
-                   class="form-control "
-                   name="row[rel_wxid]" type="text" value="{$row.rel_wxid}">
+            <select id="c-rel_wxid" class="form-control" name="row[rel_wxid]">
+                <option value="">请选择</option>
+            </select>
         </div>
     </div>
     <div class="form-group">