blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-06-03 12:29:16 +08:00
Code Issues Projects Releases Wiki Activity

Update UserService.php

Browse Source
This commit is contained in:
Anyon 2020-09-14 13:30:09 +08:00
parent 2015660e81
commit 77c754f6d2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/data/service/UserService.php
View File

@ -54,16 +54,18 @@ class UserService extends Service
*/ */
public function save(array $map, array $data = [], bool $force = false): array public function save(array $map, array $data = [], bool $force = false): array
{ {
$user = $this->app->db->name($this->table)->where($map)->where(['deleted' => 0])->find() ?: []; $query = $this->app->db->name($this->table)->where($map);
$user = $query->withoutField('deleted,password')->where(['deleted' => 0])->find() ?: [];
unset($data['id'], $data['token'], $data['tokenv'], $data['status'], $data['deleted'], $data['create_at']); unset($data['id'], $data['token'], $data['tokenv'], $data['status'], $data['deleted'], $data['create_at']);
if (empty($data) || (empty($data['phone']) && empty($data['openid1']) && empty($data['openid2']) && empty($data['unionid']))) { if (empty($data) || (empty($data['phone']) && empty($data['openid1']) && empty($data['openid2']) && empty($data['unionid']))) {
unset($user['deleted'], $user['password']);
return $user; return $user;
} elseif (empty($user['id'])) { }
if ($force) $data = array_merge($data, $this->_buildUserToken()); if ($force) {
$data = array_merge($data, $this->_buildUserToken());
}
if (empty($user['id'])) {
$user['id'] = $this->app->db->name($this->table)->strict(false)->insertGetId($data); $user['id'] = $this->app->db->name($this->table)->strict(false)->insertGetId($data);
} else { } else {
if ($force) $data = array_merge($data, $this->_buildUserToken());
$this->app->db->name($this->table)->strict(false)->where(['id' => $user['id']])->update($data); $this->app->db->name($this->table)->strict(false)->where(['id' => $user['id']])->update($data);
} }
$map = ['id' => $user['id'], 'deleted' => 0]; $map = ['id' => $user['id'], 'deleted' => 0];