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
ed4808a2
Commit
ed4808a2
authored
Aug 21, 2019
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0813-v3.3.7' of
https://gitee.com/zwyjjc/tl_estate
into 0813-v3.3.7
parents
d7d0308b
21ca1dec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
Transfer.php
application/index/controller/Transfer.php
+1
-1
No files found.
application/index/controller/Transfer.php
View file @
ed4808a2
...
...
@@ -73,7 +73,6 @@ class Transfer extends Basic
}
$where
[
'a.city'
]
=
$this
->
city
;
$where
[
'd.site_id'
]
=
$this
->
siteId
;
if
(
!
empty
(
$params
[
'agent_id'
]))
{
$where
[
'd.agent_id'
]
=
$params
[
'agent_id'
];
}
else
{
...
...
@@ -81,6 +80,7 @@ class Transfer extends Basic
if
(
is_numeric
(
$params
[
'agent_type'
]))
{
if
(
$params
[
'agent_type'
]
==
1
){
$where
[
'c.agent_id'
]
=
array
(
'gt'
,
0
);
$where
[
'd.site_id'
]
=
$this
->
siteId
;
}
else
{
$where
[]
=
[
'EXP'
,
'c.agent_id IS NULL OR c.agent_id = 0'
];
}
...
...
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