Commit 43fe8910 authored by zhuwei's avatar zhuwei

优化

parent d06ae9fc
...@@ -86,9 +86,8 @@ class Site extends Basic ...@@ -86,9 +86,8 @@ class Site extends Basic
$get_params['is_del'] = 0; $get_params['is_del'] = 0;
$res = $this->aSite->getSite($field, $params); $res = $this->aSite->getSite($field, $params);
$data['list'] = $res;
return $this->response("200", "成功", $data); return $this->response("200", "成功", $res);
} }
......
...@@ -187,7 +187,7 @@ class ImageDepot extends Basic ...@@ -187,7 +187,7 @@ class ImageDepot extends Basic
$user_id =1; $user_id =1;
$site_id =100005; $site_id ='100005,100005,100006,100007';
$user_service->setUserSites($user_id, $site_id); $user_service->setUserSites($user_id, $site_id);
} }
......
...@@ -83,6 +83,7 @@ class UserService ...@@ -83,6 +83,7 @@ class UserService
} }
$id = $this->user->edit($data, $id, $operation_id); //新增或编辑 $id = $this->user->edit($data, $id, $operation_id); //新增或编辑
$this->setUserSites($id, $data['site_id']);//设置站点
//操作完成之后判断下是什么动作 //操作完成之后判断下是什么动作
if($type == 'add'){ if($type == 'add'){
...@@ -383,14 +384,13 @@ class UserService ...@@ -383,14 +384,13 @@ class UserService
$user_res = $this->user->selectUser($user_id, "id,site_ids"); $user_res = $this->user->selectUser($user_id, "id,site_ids");
//dump($user_res);exit; //dump($user_res);exit;
if ($user_res['site_ids']) { if ($user_res['site_ids']) {
$site_ids_array = explode(',', $user_res['site_ids']); $site_ids_array = explode(',', rtrim($user_res['site_ids'], ','));
//查询是否已有此id $site_ids_array_ = explode(',', rtrim($site_id, ','));
if (in_array($site_id, $site_ids_array)) { $site_ids_merge = array_merge($site_ids_array, $site_ids_array_);//数组合并
return true;//已有此id $site_ids_merge = array_unique($site_ids_merge);//数组去重
} else {
$site_ids_array[] = $site_id;//没有 $site_ids = implode(",", $site_ids_merge);
}
$site_ids = implode(",", $site_ids_array);
} else { } else {
$site_ids = $site_id; $site_ids = $site_id;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment