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
d2361c45
Commit
d2361c45
authored
Mar 28, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
12
parent
aebe49ca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Report.php
application/index/controller/Report.php
+2
-2
OReportModel.php
application/model/OReportModel.php
+2
-2
No files found.
application/index/controller/Report.php
View file @
d2361c45
...
...
@@ -92,8 +92,8 @@ class Report extends Basic
}
//商铺ID
if
(
!
empty
(
$this
->
params
[
'
house
_id'
]))
{
$where
[
'c.house_id'
]
=
$this
->
params
[
'
house
_id'
]
;
if
(
!
empty
(
$this
->
params
[
'
shop
_id'
]))
{
$where
[
'c.house_id'
]
=
$this
->
params
[
'
shop
_id'
]
;
}
//客户ID
...
...
application/model/OReportModel.php
View file @
d2361c45
...
...
@@ -306,8 +306,8 @@ class OReportModel extends Model
}
//商铺ID
if
(
!
empty
(
$params
[
'
house
_id'
]))
{
$conditions
[]
=
"aaa.house_id =
{
$params
[
'
house
_id'
]
}
"
;
if
(
!
empty
(
$params
[
'
shop
_id'
]))
{
$conditions
[]
=
"aaa.house_id =
{
$params
[
'
shop
_id'
]
}
"
;
}
//客户ID
...
...
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