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
47c97555
Commit
47c97555
authored
Sep 04, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
45a2bcc4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
OBargainModel.php
application/model/OBargainModel.php
+3
-2
No files found.
application/model/OBargainModel.php
View file @
47c97555
...
...
@@ -237,7 +237,7 @@ class OBargainModel extends Model
*/
public
function
selectBargainList
(
$filed
,
$params
,
$pageNo
,
$pageSize
)
{
$where_
=
[];
$where_
=
$whereOr_
=
[];
if
(
isset
(
$params
[
"status"
]))
{
$where_
[
"a.status"
]
=
$params
[
"status"
];
...
...
@@ -246,7 +246,7 @@ class OBargainModel extends Model
$where_
[
"a.agent_id"
]
=
array
(
"in"
,
$params
[
"ids"
]);
}
if
(
isset
(
$params
[
"submit_agent_id"
]))
{
$where_
[
"a.submit_agent_id"
]
=
$params
[
"submit_agent_id"
];
$where
Or
_
[
"a.submit_agent_id"
]
=
$params
[
"submit_agent_id"
];
}
if
(
isset
(
$params
[
"account_statement"
]))
{
...
...
@@ -294,6 +294,7 @@ class OBargainModel extends Model
->
join
(
"o_order c"
,
"a.order_id = c.id"
,
"left"
)
->
join
(
"g_houses d"
,
"c.house_id = d.id"
,
"left"
)
->
where
(
$where_
)
->
whereOr
(
$whereOr_
)
->
order
(
"a.create_time desc"
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
...
...
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