From 45fabb811384e7e396814fcbb75b2d9c7a555f80 Mon Sep 17 00:00:00 2001
From: meimei <102865034@qq.com>
Date: Fri, 18 Apr 2025 16:16:51 +0800
Subject: [PATCH] fixed

---
 admin/application/admin/controller/Firmstoreprojectstwo.php     | 1 +
 admin/application/admin/view/firmstore/index.html               | 2 +-
 admin/public/assets/js/backend/firmstoreprojectsone.js          | 2 +-
 .../application/admin/controller/Firmstoreprojectstwo.php       | 1 +
 superadmin/application/admin/view/firmstore/index.html          | 2 +-
 superadmin/public/assets/js/backend/firmstoreprojectsone.js     | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/application/admin/controller/Firmstoreprojectstwo.php b/admin/application/admin/controller/Firmstoreprojectstwo.php
index bdd05c7..04756c6 100755
--- a/admin/application/admin/controller/Firmstoreprojectstwo.php
+++ b/admin/application/admin/controller/Firmstoreprojectstwo.php
@@ -57,6 +57,7 @@ class Firmstoreprojectstwo extends Backend
             $list = $this->model
                     ->with(['firmstoreprojectsone'])
                     ->where($where)
+                ->where('firmstoreprojectsone_id',input('ids'))
                     ->order($sort, $order)
                     ->paginate($limit);
 
diff --git a/admin/application/admin/view/firmstore/index.html b/admin/application/admin/view/firmstore/index.html
index c9d9b70..47fa9d5 100755
--- a/admin/application/admin/view/firmstore/index.html
+++ b/admin/application/admin/view/firmstore/index.html
@@ -8,7 +8,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('firmstore/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('firmstore/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('firmstore/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('firmstore/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
diff --git a/admin/public/assets/js/backend/firmstoreprojectsone.js b/admin/public/assets/js/backend/firmstoreprojectsone.js
index 085d698..47c0047 100755
--- a/admin/public/assets/js/backend/firmstoreprojectsone.js
+++ b/admin/public/assets/js/backend/firmstoreprojectsone.js
@@ -52,7 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     title: __('查看二级项目列表'),
                                     classname: 'btn btn-xs btn-success btn-dialog',
                                     icon: 'fa fa-list',
-                                    url: 'firmstoreprojectstwo/index',
+                                    url: 'firmstoreprojectstwo/index?ids={ids}',
                                     callback: function (data) {
                                         Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
                                     },
diff --git a/superadmin/application/admin/controller/Firmstoreprojectstwo.php b/superadmin/application/admin/controller/Firmstoreprojectstwo.php
index 06d0d43..4e987c4 100755
--- a/superadmin/application/admin/controller/Firmstoreprojectstwo.php
+++ b/superadmin/application/admin/controller/Firmstoreprojectstwo.php
@@ -54,6 +54,7 @@ class Firmstoreprojectstwo extends Backend
             $list = $this->model
                     ->with(['firmstoreprojectsone','firm'])
                     ->where($where)
+                    ->where('firmstoreprojectsone_id',input('ids'))
                     ->order($sort, $order)
                     ->paginate($limit);
 
diff --git a/superadmin/application/admin/view/firmstore/index.html b/superadmin/application/admin/view/firmstore/index.html
index c9d9b70..47fa9d5 100755
--- a/superadmin/application/admin/view/firmstore/index.html
+++ b/superadmin/application/admin/view/firmstore/index.html
@@ -8,7 +8,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('firmstore/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('firmstore/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('firmstore/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('firmstore/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
diff --git a/superadmin/public/assets/js/backend/firmstoreprojectsone.js b/superadmin/public/assets/js/backend/firmstoreprojectsone.js
index aa2e3a3..dd16d4f 100755
--- a/superadmin/public/assets/js/backend/firmstoreprojectsone.js
+++ b/superadmin/public/assets/js/backend/firmstoreprojectsone.js
@@ -53,7 +53,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     title: __('查看二级项目列表'),
                                     classname: 'btn btn-xs btn-success btn-dialog',
                                     icon: 'fa fa-list',
-                                    url: 'firmstoreprojectstwo/index',
+                                    url: 'firmstoreprojectstwo/index?ids={ids}',
                                     callback: function (data) {
                                         Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
                                     },