fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整与触客宝数据交换用户的密码加密方式

Browse Source
This commit is contained in:
柳清爽
2025-04-22 09:54:03 +08:00
parent 05cee48a3d
commit da5e01e856
4 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Server/application/superadmin/controller/company/CreateCompanyController.php
View File

@@ -93,7 +93,7 @@ class CreateCompanyController extends BaseController
}
return array_merge($params, [
'companyId' => $department['departmentId'],
'companyId' => $department['departmentId'],
's2_accountId' => $department['id'],
]);
}
@@ -125,14 +125,15 @@ class CreateCompanyController extends BaseController
protected function ckbCreateUser(array $params): void
{
$params = ArrHelper::getValue(
'username,account,password=passwordLocal,companyId,s2_accountId,status,realName',
'username,account,password,companyId,s2_accountId,status,realName',
$params
);
$result = UsersModel::create(array_merge($params, [
'passwordMd5' => md5($params['passwordLocal']),
'passwordLocal' => localEncrypt($params['password']),
'passwordMd5' => md5($params['password']),
'isAdmin' => 1, // 主要账号默认1
'typeId' => 1, // 类型：运营后台/操盘手传1、 门店传2
'typeId' => 1, // 类型：运营后台/操盘手传1、 门店传2
]));
if (!$result) {

3
Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
View File

@@ -39,7 +39,8 @@ class GetCompanyDetailForUpdateController extends BaseController
{
$detail = CompanyModel::alias('c')
->field([
'c.id', 'c.name', 'c.status', 'c.memo', 'c.companyId', 'u.account', 'u.username', 'u.phone',
'c.id', 'c.name', 'c.status', 'c.memo', 'c.companyId',
'u.account', 'u.username', 'u.phone', 'u.s2_accountId'
])
->leftJoin('users u', 'c.companyId = u.companyId')
->find($id);

7
Server/application/superadmin/controller/company/UpdateCompanyController.php
View File

@@ -84,11 +84,12 @@ class UpdateCompanyController extends BaseController
*/
protected function updateUserAccount(array $params): void
{
$params = ArrHelper::getValue('username,account,password=passwordLocal,realName,status', $params);
$params = ArrHelper::getValue('username,account,password,realName,status', $params);
$params = ArrHelper::rmValue($params);
if (isset($params['passwordLocal'])) {
$params['passwordMd5'] = md5($params['passwordLocal']);
if (isset($params['password'])) {
$params['passwordMd5'] = md5($params['password']);
$params['passwordLocal'] = localEncrypt($params['passwordLocal']);
}
$user = $this->getUserDetailByCompanyId();