diff --git a/extend/fast/Auth.php b/extend/fast/Auth.php
index 396c4cfc9..628abc2fa 100644
--- a/extend/fast/Auth.php
+++ b/extend/fast/Auth.php
@@ -153,11 +153,12 @@ class Auth
}
// 执行查询
+ $nowTime = time();
$user_groups = Db::name($this->config['auth_group_access'])
->alias('aga')
->join('__' . strtoupper($this->config['auth_group']) . '__ ag', 'aga.group_id = ag.id', 'LEFT')
->field('aga.uid,aga.group_id,ag.id,ag.pid,ag.name,ag.rules')
- ->where("aga.uid='{$uid}' and ag.status='normal'")
+ ->where("aga.uid='{$uid}' and ag.status='normal' and (ag.expiretime>={$nowTime} or ag.expiretime=0)")
->select();
$groups[$uid] = $user_groups ?: [];
return $groups[$uid];
diff --git a/public/assets/js/backend/auth/group.js b/public/assets/js/backend/auth/group.js
index 94a4b4b43..e076db6e6 100755
--- a/public/assets/js/backend/auth/group.js
+++ b/public/assets/js/backend/auth/group.js
@@ -50,6 +50,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
{field: 'pid', title: __('Parent')},
{field: 'name', title: __('Name'), align: 'left'},
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
+ {field: 'expiretime', title: __('Expire time'), formatter: function (value,row,index) {
+ if (0 === value) {
+ return '
永久';
+ } else {
+ if (value >= parseInt(new Date().getTime()/1000)) {
+ var date = new Date(value * 1000);
+ var Y = date.getFullYear() + '-';
+ var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+ var D = date.getDate() + ' ';
+ var h = date.getHours() + ':';
+ var m = date.getMinutes() + ':';
+ var s = date.getSeconds();
+ return '
'+(Y + M + D + h + m + s)+'';
+ } else {
+ return '
已过期';
+ }
+ }
+ }},
{
field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {
if (Config.admin.group_ids.indexOf(parseInt(row.id)) > -1) {
@@ -122,6 +140,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
$(document).on("click", "#expandall", function () {
$("#treeview").jstree($(this).prop("checked") ? "open_all" : "close_all");
});
+ //过期时间: 永久和选择时间
+ $(document).on("click", "#for_ever", function () {
+ $("#expiretime-select").attr("style","display:none;");
+ $("input[name='row[expiretime]']").val('0');
+ $("#select_time").removeAttr("checked");
+ });
+ $(document).on("click", "#select_time", function () {
+ $("#expiretime-select").attr("style","display:block;");
+ $("#for_ever").removeAttr("checked");
+ var nowDate = new Date();
+ $("input[name='row[expiretime]']").val(nowDate.getFullYear() + '-' + (nowDate.getMonth()+1) + '-' + nowDate.getDate() + ' 23:59:59');
+ });
$("select[name='row[pid]']").trigger("change");
},
rendertree: function (content) {
--
Gitee
From 58f60776222e0baaecbc16b17cd1de5cb282e993 Mon Sep 17 00:00:00 2001
From: zsgwakk <1752569024@qq.com >
Date: Sun, 29 Dec 2019 19:50:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E7=8E=B0:=E8=97=8F=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E7=9A=84=E8=A7=92=E8=89=B2=E5=8F=8A=E5=85=B6=E5=AD=90?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E5=9C=A8=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=B8=8B=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/library/Auth.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index 73826e454..eb0ce8e58 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -282,7 +282,8 @@ class Auth extends \fast\Auth
}
}
// 取出所有分组
- $groupList = \app\admin\model\AuthGroup::where(['status' => 'normal'])->select();
+// $groupList = \app\admin\model\AuthGroup::where(['status' => 'normal'])->select();
+ $groupList = \app\admin\model\AuthGroup::all();
$objList = [];
foreach ($groups as $k => $v) {
if ($v['rules'] === '*') {
--
Gitee