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
9c8cc4e2
Commit
9c8cc4e2
authored
Jun 27, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
54522d0c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
OfficeOBargainModel.php
application/model/OfficeOBargainModel.php
+2
-2
No files found.
application/model/OfficeOBargainModel.php
View file @
9c8cc4e2
...
@@ -1401,7 +1401,7 @@ class OfficeOBargainModel extends Model
...
@@ -1401,7 +1401,7 @@ class OfficeOBargainModel extends Model
//->join('a_store Store', 'Agent.store_id = Store.id', 'left')
//->join('a_store Store', 'Agent.store_id = Store.id', 'left')
//->join('a_district District', 'Agent.district_id = District.id', 'left')
//->join('a_district District', 'Agent.district_id = District.id', 'left')
->
join
(
'o_partial_commission PartialCommission'
,
'PartialCommission.bargain_id = Obargain.id'
,
'left'
)
->
join
(
'o
ffice_o
_partial_commission PartialCommission'
,
'PartialCommission.bargain_id = Obargain.id'
,
'left'
)
->
where
(
$where
)
->
where
(
$where
)
->
order
(
"Obargain.create_time desc"
)
->
order
(
"Obargain.create_time desc"
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
...
@@ -1466,7 +1466,7 @@ class OfficeOBargainModel extends Model
...
@@ -1466,7 +1466,7 @@ class OfficeOBargainModel extends Model
->
join
(
"a_agents Agent"
,
"Obargain.agent_id = Agent.id"
,
"left"
)
->
join
(
"a_agents Agent"
,
"Obargain.agent_id = Agent.id"
,
"left"
)
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
// ->join('a_district District', 'Agent.district_id = District.id', 'left')
// ->join('a_district District', 'Agent.district_id = District.id', 'left')
->
join
(
'o_partial_commission PartialCommission'
,
'PartialCommission.bargain_id = Obargain.id'
,
'left'
)
->
join
(
'o
ffice_o
_partial_commission PartialCommission'
,
'PartialCommission.bargain_id = Obargain.id'
,
'left'
)
->
where
(
$where
)
->
where
(
$where
)
->
count
();
->
count
();
...
...
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