|
@@ -32,7 +32,13 @@ class Admins extends Base
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$result = db('admins')->where($where)->limit($offset, $limit)->select();
|
|
$result = db('admins')->where($where)->limit($offset, $limit)->select();
|
|
|
|
|
+ $powergroup = db('admingroup')->select();
|
|
|
foreach ($result as $key => $vo) {
|
|
foreach ($result as $key => $vo) {
|
|
|
|
|
+ for($i=0;$i<count($powergroup);$i++){
|
|
|
|
|
+ if($result[$key]['group_id'] == $powergroup[$i]['group_id']){
|
|
|
|
|
+ $result[$key]['group_name'] = $powergroup[$i]['group_name'];
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
// 优化显示状态
|
|
// 优化显示状态
|
|
|
if (1 == $vo['status']) {
|
|
if (1 == $vo['status']) {
|
|
|
$result[$key]['status'] = '<span class="label label-primary">启用</span>';
|
|
$result[$key]['status'] = '<span class="label label-primary">启用</span>';
|
|
@@ -71,8 +77,11 @@ class Admins extends Base
|
|
|
return json(['code' => -1, 'data' => '', 'msg' => '该管理员已经存在']);
|
|
return json(['code' => -1, 'data' => '', 'msg' => '该管理员已经存在']);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $param['password'] = md5($param['password'] . config('salt'));
|
|
|
|
|
|
|
+ if(empty($param['group_id'])){
|
|
|
|
|
+ return json(['code' => -4, 'data' => '', 'msg' => '请选择权限']);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
+ $param['password'] = md5($param['password'] . config('salt'));
|
|
|
try {
|
|
try {
|
|
|
db('admins')->insert($param);
|
|
db('admins')->insert($param);
|
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
@@ -81,8 +90,9 @@ class Admins extends Base
|
|
|
|
|
|
|
|
return json(['code' => 1, 'data' => '', 'msg' => '添加管理员成功']);
|
|
return json(['code' => 1, 'data' => '', 'msg' => '添加管理员成功']);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ $admingroup = db('admingroup')->select();
|
|
|
$this->assign([
|
|
$this->assign([
|
|
|
|
|
+ 'admingroup' => $admingroup,
|
|
|
'status' => config('kf_status')
|
|
'status' => config('kf_status')
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
@@ -288,6 +298,7 @@ class Admins extends Base
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
db('admingroup')->where('group_id', $id)->delete();
|
|
db('admingroup')->where('group_id', $id)->delete();
|
|
|
|
|
+ db('admingrouppower')->where('group_id', $id)->delete();
|
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
|
return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
|
|
return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
|
|
|
}
|
|
}
|