|
@@ -258,11 +258,19 @@ class Business extends Auth{
|
|
}
|
|
}
|
|
//获取店铺信息
|
|
//获取店铺信息
|
|
$info = $Model->getOne($id);
|
|
$info = $Model->getOne($id);
|
|
|
|
+ //获取用户信息
|
|
|
|
+ $userInfo = $AdminUser->getOne($info['admin_uid']);
|
|
// 写入数据表
|
|
// 写入数据表
|
|
- $result = $AdminUser->edit($info['admin_uid'],$userData);
|
|
|
|
|
|
+ if (!$userInfo){
|
|
|
|
+ $result = $AdminUser->add($userData);
|
|
|
|
+ if( !$result ) return json_send(['code'=>'error','msg'=>'新增失败']);
|
|
|
|
+ $result = $Model->edit($id,['admin_uid'=>$result['admin_uid']]);
|
|
|
|
+ if( !$result ) return json_send(['code'=>'error','msg'=>'新增失败']);
|
|
|
|
+ }else{
|
|
|
|
+ $result = $AdminUser->edit($info['admin_uid'],$userData);
|
|
|
|
+ }
|
|
// 如果操作失败
|
|
// 如果操作失败
|
|
if( !$result ) return json_send(['code'=>'error','msg'=>'新增失败']);
|
|
if( !$result ) return json_send(['code'=>'error','msg'=>'新增失败']);
|
|
- //var_dump($data);exit();
|
|
|
|
// 记录行为
|
|
// 记录行为
|
|
$this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,$oldData,$data);
|
|
$this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,$oldData,$data);
|
|
// 告知结果
|
|
// 告知结果
|
|
@@ -277,7 +285,7 @@ class Business extends Auth{
|
|
$oldData['city_ids'] = explode(',',$oldData['city_ids']);
|
|
$oldData['city_ids'] = explode(',',$oldData['city_ids']);
|
|
// 获取列表
|
|
// 获取列表
|
|
$cityList = $City->getCityList();
|
|
$cityList = $City->getCityList();
|
|
- $session = session('userRule') ? session('userRule') : ['menu_type'=>0,'company_id'=>0,'business_id'=>0];
|
|
|
|
|
|
+ $session = session('userRule') ? session('userRule') : ['menu_type'=>0,'company_id'=>0,'business_id'=>0];
|
|
$mp = [];
|
|
$mp = [];
|
|
if ($session){
|
|
if ($session){
|
|
$mp[] = ['admin_rule.company_id','=',$session['company_id']];
|
|
$mp[] = ['admin_rule.company_id','=',$session['company_id']];
|