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
16dc54bf
Commit
16dc54bf
authored
Jun 27, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
o_
parent
2caf67ba
Show 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 @
16dc54bf
...
...
@@ -1326,8 +1326,8 @@ class OfficeOBargainModel extends Model
$result
=
$this
->
db_
->
field
(
$filed
)
->
alias
(
"a"
)
->
join
(
"o
_o
ffice_o_partial_commission b"
,
"a.id = b.bargain_id"
,
"left"
)
->
join
(
"o
_o
ffice_o_real_income c"
,
"b.real_income_id = c.id"
,
"left"
)
->
join
(
"office_o_partial_commission b"
,
"a.id = b.bargain_id"
,
"left"
)
->
join
(
"office_o_real_income c"
,
"b.real_income_id = c.id"
,
"left"
)
->
where
(
$where_
)
->
whereOr
(
$whereOr_
)
->
order
(
"a.id asc"
)
...
...
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