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
fb539b8b
Commit
fb539b8b
authored
Mar 09, 2018
by
zfc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
保护期暂时取消
parent
86fffc64
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
Client.php
application/api_broker/controller/Client.php
+5
-2
Auth.php
application/index/controller/Auth.php
+2
-2
No files found.
application/api_broker/controller/Client.php
View file @
fb539b8b
...
...
@@ -134,7 +134,9 @@ class Client extends Basic
if
(
!
empty
(
$params
[
'search'
])){
//搜索客户--可以搜索自己的客户and 不在保护期的客户
$where
=
" (agent_id in(0,
{
$params
[
'agent_id'
]
}
) or agent_id is null or TIMESTAMPDIFF(MINUTE,create_time,'
{
$time
}
') > 2880 )
// $where = " (agent_id in(0,{$params['agent_id']}) or agent_id is null or TIMESTAMPDIFF(MINUTE,create_time,'{$time}') > 2880 )
// and ( user_nick like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) ";
$where
=
" (agent_id in(0,
{
$params
[
'agent_id'
]
}
) or agent_id is null or TIMESTAMPDIFF(MINUTE,create_time,'
{
$time
}
') > 0 )
and ( user_nick like '%
{
$params
[
'search'
]
}
%' or user_phone like '%
{
$params
[
'search'
]
}
%' ) "
;
$data
[
'search'
]
=
$params
[
'search'
];
}
...
...
@@ -176,7 +178,8 @@ class Client extends Basic
'a.sub_shopname'
,
"TIMESTAMPDIFF(MINUTE,f.create_time,'
{
$time
}
')as time_minute_diff"
];
$where
=
"(u.agent_id in(0,
{
$params
[
'agent_id'
]
}
) or f.user_id is null or TIMESTAMPDIFF(MINUTE,u.create_time,'
{
$time
}
') > 2880 ) "
;
//$where="(u.agent_id in(0,{$params['agent_id']}) or f.user_id is null or TIMESTAMPDIFF(MINUTE,u.create_time,'{$time}') > 2880 ) ";
$where
=
"(u.agent_id in(0,
{
$params
[
'agent_id'
]
}
) or f.user_id is null or TIMESTAMPDIFF(MINUTE,u.create_time,'
{
$time
}
') > 0 ) "
;
if
(
!
empty
(
$search
)){
$where
.=
" and f.content like '%
$search
%' "
;
$data
[
'search'
]
=
$search
;
...
...
application/index/controller/Auth.php
View file @
fb539b8b
...
...
@@ -156,7 +156,7 @@ class Auth extends Basic
if
(
$table
->
editData
(
$data
,
$id
))
{
return
$this
->
response
(
200
,
'成功'
);
}
else
{
return
$this
->
response
(
101
,
'
失败
'
);
return
$this
->
response
(
101
,
'
未改动或者角色名重复!
'
);
}
...
...
@@ -300,7 +300,7 @@ class Auth extends Basic
if
(
$table
->
saveStatus
(
'status'
,
$data
[
'status'
],
$ids
)){
return
$this
->
response
(
200
,
'成功'
,
$data
);
}
else
{
return
$this
->
response
(
100
,
'
未改动或者角色名重复!
'
,
$data
);
return
$this
->
response
(
100
,
'
失败
'
,
$data
);
}
}
//权限表界面
...
...
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