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
10c9bbc5
Commit
10c9bbc5
authored
Aug 08, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
98cd926d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
OBargainModel.php
application/model/OBargainModel.php
+1
-1
OReportModel.php
application/model/OReportModel.php
+1
-2
No files found.
application/model/OBargainModel.php
View file @
10c9bbc5
...
...
@@ -708,7 +708,7 @@ class OBargainModel extends Model
->
join
(
$join
)
->
where
(
$where_
)
->
select
();
//
echo $this->getLastSql();
//
echo $this->getLastSql();
return
$return
;
}
...
...
application/model/OReportModel.php
View file @
10c9bbc5
...
...
@@ -555,7 +555,7 @@ class OReportModel extends Model
*/
public
function
getAddReportNum
(
$params
)
{
$field
=
"count(
1
) as num"
;
$field
=
"count(
DISTINCT a.id
) as num"
;
$where_
=
[];
if
(
isset
(
$params
[
"agent_id"
]))
{
$where_
[
"a.report_agent_id"
]
=
$params
[
"agent_id"
];
...
...
@@ -573,7 +573,6 @@ class OReportModel extends Model
->
join
(
"o_order b"
,
"a.id = b.f_id"
,
"left"
)
->
where
(
$where_
)
->
select
();
//echo Db::table($this->table)->getLastSql();
return
$result
;
}
...
...
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