diff --git a/src/plugin/admin/app/controller/Base.php b/src/plugin/admin/app/controller/Base.php
index e620d6a..f997cd6 100644
--- a/src/plugin/admin/app/controller/Base.php
+++ b/src/plugin/admin/app/controller/Base.php
@@ -17,7 +17,7 @@ class Base
protected $model = null;
/**
- * 无需登录的方法及鉴权
+ * 无需登录及鉴权的方法
* @var array
*/
protected $noNeedLogin = [];
@@ -28,6 +28,13 @@ class Base
*/
protected $noNeedAuth = [];
+ /**
+ * 数据限制
+ * 例如当$dataLimit='admin_id'时将只返回当前管理员的数据
+ * @var string
+ */
+ protected $dataLimit = null;
+
/**
* 返回格式化json数据
*
diff --git a/src/plugin/admin/app/controller/Crud.php b/src/plugin/admin/app/controller/Crud.php
index 5250c48..1aa8fbf 100644
--- a/src/plugin/admin/app/controller/Crud.php
+++ b/src/plugin/admin/app/controller/Crud.php
@@ -117,6 +117,10 @@ class Crud extends Base
unset($where[$column]);
}
}
+ // 按照数据限制字段返回数据
+ if ($this->dataLimit) {
+ $where[$this->dataLimit] = admin_id();
+ }
return [$where, $format, $page_size, $field, $order];
}
diff --git a/src/plugin/admin/app/controller/UploadController.php b/src/plugin/admin/app/controller/UploadController.php
index 383aaf2..289ded5 100644
--- a/src/plugin/admin/app/controller/UploadController.php
+++ b/src/plugin/admin/app/controller/UploadController.php
@@ -21,6 +21,12 @@ class UploadController extends Crud
*/
protected $model = null;
+ /**
+ * 按照admin_id字段限制返回数据
+ * @var string
+ */
+ protected $dataLimit = 'admin_id';
+
/**
* 构造函数
* @return void
diff --git a/src/plugin/admin/app/view/upload/attachment.html b/src/plugin/admin/app/view/upload/attachment.html
index 5d0c4d6..9795b50 100644
--- a/src/plugin/admin/app/view/upload/attachment.html
+++ b/src/plugin/admin/app/view/upload/attachment.html
@@ -35,13 +35,6 @@
-
-
-
-
@@ -116,27 +109,6 @@
});
})
- // 字段 管理员 admin_id
- layui.use(["jquery", "xmSelect"], function() {
- layui.$.ajax({
- url: "/app/admin/admin/select?format=select",
- dataType: "json",
- success: function (e) {
- let value = layui.$("#admin_id").attr("value");
- let initValue = value ? value.split(",") : [];
- layui.xmSelect.render({
- el: "#admin_id",
- name: "admin_id",
- initValue: initValue,
- data: e.data,
- model: {"icon":"hidden","label":{"type":"text"}},
- clickClose: true,
- radio: true,
- })
- }
- });
- });
-
// 字段 类别 category
layui.use(["jquery", "xmSelect"], function() {
layui.$.ajax({
@@ -271,10 +243,8 @@
// 获取表格中下拉或树形组件数据
let apis = [];
- apis.push(["admin_id", "/app/admin/admin/select?format=select"]);
apis.push(["category", "/app/admin/dict/get/upload"]);
let apiResults = {};
- apiResults["admin_id"] = [];
apiResults["category"] = [];
let count = apis.length;
layui.each(apis, function (k, item) {
diff --git a/src/plugin/admin/config/menu.php b/src/plugin/admin/config/menu.php
index 3d07d20..9bdc7e1 100644
--- a/src/plugin/admin/config/menu.php
+++ b/src/plugin/admin/config/menu.php
@@ -77,25 +77,25 @@ return [
'type' => 1,
'weight' => 800,
],
- [
- 'title' => '系统设置',
- 'key' => 'plugin\\admin\\app\\controller\\ConfigController',
- 'href' => '/app/admin/config/index',
- 'type' => 1,
- 'weight' => 700,
- ],
[
'title' => '附件管理',
'key' => 'plugin\\admin\\app\\controller\\UploadController',
'href' => '/app/admin/upload/index',
'type' => 1,
- 'weight' => 600,
+ 'weight' => 700,
],
[
'title' => '字典设置',
'key' => 'plugin\\admin\\app\\controller\\DictController',
'href' => '/app/admin/dict/index',
'type' => 1,
+ 'weight' => 600,
+ ],
+ [
+ 'title' => '系统设置',
+ 'key' => 'plugin\\admin\\app\\controller\\ConfigController',
+ 'href' => '/app/admin/config/index',
+ 'type' => 1,
'weight' => 500,
],
]