|
|
@@ -21,7 +21,7 @@ class AdminClass extends BaseClass
|
|
|
];
|
|
|
|
|
|
//组合员工基本信息 shish 2019.12.9
|
|
|
- public static function groupAdminBaseInfo($list)
|
|
|
+ public static function groupAdminBaseInfo($list, $sensitive = true)
|
|
|
{
|
|
|
$roleIdList = array_column($list, 'roleId');
|
|
|
$userIdList = array_column($list, 'userId');
|
|
|
@@ -40,6 +40,12 @@ class AdminClass extends BaseClass
|
|
|
$list[$key]['lastLoginTime'] = date("Y-m-d H:i", $val['loginTime']);
|
|
|
$list[$key]['openId'] = isset($userInfo[$userId]['openId']) ? $userInfo[$userId]['openId'] : '';
|
|
|
$list[$key]['subscribe'] = isset($userInfo[$userId]['subscribe']) ? $userInfo[$userId]['subscribe'] : 0;
|
|
|
+ //敏感信息
|
|
|
+ if ($sensitive) {
|
|
|
+ $list[$key]['openId'] = '';
|
|
|
+ $list[$key]['password'] = '';
|
|
|
+ $list[$key]['confirmPassword']='';
|
|
|
+ }
|
|
|
}
|
|
|
return $list;
|
|
|
}
|
|
|
@@ -92,6 +98,8 @@ class AdminClass extends BaseClass
|
|
|
util::fail('名字已被使用');
|
|
|
}
|
|
|
|
|
|
+ $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
|
|
|
+
|
|
|
$respond = self::add($data);
|
|
|
return $respond;
|
|
|
}
|
|
|
@@ -167,6 +175,8 @@ class AdminClass extends BaseClass
|
|
|
//密码留空不修改密码
|
|
|
if (isset($data['password']) && empty($data['password'])) {
|
|
|
unset($data['password']);
|
|
|
+ } else {
|
|
|
+ $data['password'] = password_hash($data['password'], PASSWORD_BCRYPT);
|
|
|
}
|
|
|
|
|
|
$adminName = $data['adminName'];
|