Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
43fe8910
Commit
43fe8910
authored
Oct 19, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
d06ae9fc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
+10
-11
Site.php
application/api_broker/controller/Site.php
+1
-2
ImageDepot.php
application/index/controller/ImageDepot.php
+1
-1
UserService.php
application/index/service/UserService.php
+8
-8
No files found.
application/api_broker/controller/Site.php
View file @
43fe8910
...
...
@@ -86,9 +86,8 @@ class Site extends Basic
$get_params
[
'is_del'
]
=
0
;
$res
=
$this
->
aSite
->
getSite
(
$field
,
$params
);
$data
[
'list'
]
=
$res
;
return
$this
->
response
(
"200"
,
"成功"
,
$
data
);
return
$this
->
response
(
"200"
,
"成功"
,
$
res
);
}
...
...
application/index/controller/ImageDepot.php
View file @
43fe8910
...
...
@@ -187,7 +187,7 @@ class ImageDepot extends Basic
$user_id
=
1
;
$site_id
=
100005
;
$site_id
=
'100005,100005,100006,100007'
;
$user_service
->
setUserSites
(
$user_id
,
$site_id
);
}
...
...
application/index/service/UserService.php
View file @
43fe8910
...
...
@@ -83,6 +83,7 @@ class UserService
}
$id
=
$this
->
user
->
edit
(
$data
,
$id
,
$operation_id
);
//新增或编辑
$this
->
setUserSites
(
$id
,
$data
[
'site_id'
]);
//设置站点
//操作完成之后判断下是什么动作
if
(
$type
==
'add'
){
...
...
@@ -383,14 +384,13 @@ class UserService
$user_res
=
$this
->
user
->
selectUser
(
$user_id
,
"id,site_ids"
);
//dump($user_res);exit;
if
(
$user_res
[
'site_ids'
])
{
$site_ids_array
=
explode
(
','
,
$user_res
[
'site_ids'
]);
//查询是否已有此id
if
(
in_array
(
$site_id
,
$site_ids_array
))
{
return
true
;
//已有此id
}
else
{
$site_ids_array
[]
=
$site_id
;
//没有
}
$site_ids
=
implode
(
","
,
$site_ids_array
);
$site_ids_array
=
explode
(
','
,
rtrim
(
$user_res
[
'site_ids'
],
','
));
$site_ids_array_
=
explode
(
','
,
rtrim
(
$site_id
,
','
));
$site_ids_merge
=
array_merge
(
$site_ids_array
,
$site_ids_array_
);
//数组合并
$site_ids_merge
=
array_unique
(
$site_ids_merge
);
//数组去重
$site_ids
=
implode
(
","
,
$site_ids_merge
);
}
else
{
$site_ids
=
$site_id
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment