Merge branch 'master' into monanxiao

This commit is contained in:
monanxiao 2023-03-20 13:39:12 +08:00
commit 9b44dfb02e

View File

@ -611,16 +611,7 @@ class User extends BaseController
// 修改user表
$ddd['is_admin'] = 1;
$ddd['group_id'] = $params['group_id'];
// Db::table('fa_user')->where('id', $params['id'])->update($ddd);
Db::connect('shop')->table('eb_user')->where('uid',$params['id'])->update($ddd);
// 修改商城关系表
// $nk_user['n_user_id'] = $params['id'];
// $is_nk_user = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
// if ($is_nk_user) {
// $nk_data['group_id'] = $params['group_id'];
// Db::connect('shop')->name('nk_user')->where($nk_user)->update($nk_data);
// }
// 修改用户详细地址
$u_msg['address_name'] = $address_name;
$u_msg['area_id'] = $params['area_id'];
@ -656,7 +647,7 @@ class User extends BaseController
Db::startTrans();
try {
$w['user_id'] = $params['id'];
$is_have = Db::table('fa_szxc_information_useraddress')->where($w)->find();
// $is_have = Db::table('fa_szxc_information_useraddress')->where($w)->find();
// 创建管理员账号
$admin_id = Db::name('Admin')->insertGetId($data);
// 写入权限组