|
|
@@ -97,16 +97,15 @@ class Admin extends Apic
|
|
|
->field(['password', 'salt', 'token'], true)
|
|
|
->order('id', 'asc')
|
|
|
->paginate();
|
|
|
-
|
|
|
- foreach ($list as $k => &$v) {
|
|
|
+ $list2 = $list->items();
|
|
|
+ foreach ($list2 as $k => &$v) {
|
|
|
$v['avatar'] = localpath_to_netpath($v['avatar']);
|
|
|
$groups = isset($adminGroupName[$v['id']]) ? $adminGroupName[$v['id']] : [];
|
|
|
$v['groups'] = implode(',', array_keys($groups));
|
|
|
$v['groups_text'] = implode(',', array_values($groups));
|
|
|
}
|
|
|
unset($v);
|
|
|
-
|
|
|
- $result = array("total" => $list->total(), "list" => $list->items());
|
|
|
+ $result = array("total" => $list->total(), "list" => $list2);
|
|
|
$this->success(1,$result);
|
|
|
|
|
|
}
|
|
|
@@ -121,6 +120,7 @@ class Admin extends Apic
|
|
|
'nickname' => input('nickname',''),//姓名
|
|
|
'password' => input('password',''),//密码
|
|
|
'gonghao' => input('gonghao',''), //工号
|
|
|
+ 'avatar' => input('avatar',''), //头像
|
|
|
];
|
|
|
$group_id = input('group_id',0);
|
|
|
if(empty($group_id)){
|
|
|
@@ -137,7 +137,7 @@ class Admin extends Apic
|
|
|
$params['company_id'] = $this->auth->company_id;
|
|
|
$params['salt'] = Random::alnum();
|
|
|
$params['password'] = $this->auth->getEncryptPassword($params['password'], $params['salt']);
|
|
|
- $params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。
|
|
|
+// $params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。
|
|
|
$result = $this->model->validate('Admin.add')->save($params);
|
|
|
if ($result === false) {
|
|
|
exception($this->model->getError());
|
lizhen_gitee