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
e0c0bfa8
Commit
e0c0bfa8
authored
Jun 27, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9c8cc4e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
OfficeRoomApiService.php
application/api/service/OfficeRoomApiService.php
+1
-1
OfficeRoomService.php
application/index/service/OfficeRoomService.php
+1
-2
OfficeGRoom.php
application/model/OfficeGRoom.php
+3
-1
No files found.
application/api/service/OfficeRoomApiService.php
View file @
e0c0bfa8
...
...
@@ -175,7 +175,7 @@ class OfficeRoomApiService
$ids
=
""
;
if
(
count
(
$buildingArr
)
>
0
)
{
foreach
(
$buildingArr
as
$item
)
{
$ids
.=
$item
[
"id"
]
.
","
;
$ids
.=
$item
[
"
building_
id"
]
.
","
;
}
$ids
=
rtrim
(
$ids
,
","
);
}
...
...
application/index/service/OfficeRoomService.php
View file @
e0c0bfa8
...
...
@@ -1356,11 +1356,10 @@ class OfficeRoomService
$field
=
"building_id,stations_id"
;
$params
[
"stations_id"
]
=
array
(
"in"
,
$stations_str
);
$buildingArr
=
$buildingStationsModel
->
getBuilderByStations
(
$field
,
$params
);
$ids
=
""
;
if
(
count
(
$buildingArr
)
>
0
)
{
foreach
(
$buildingArr
as
$item
)
{
$ids
.=
$item
[
"id"
]
.
","
;
$ids
.=
$item
[
"
building_
id"
]
.
","
;
}
$ids
=
rtrim
(
$ids
,
","
);
}
...
...
application/model/OfficeGRoom.php
View file @
e0c0bfa8
...
...
@@ -425,7 +425,7 @@ class OfficeGRoom extends BaseModel
public
function
getRoomBuilding
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'a.id desc'
,
$field
=
''
,
$params
=
''
)
{
$params
[
'b.is_del'
]
=
0
;
return
$this
->
field
(
$field
)
$result
=
$this
->
field
(
$field
)
->
alias
(
'a'
)
->
join
(
'office_g_building b'
,
'a.building_id = b.id'
,
'left'
)
->
join
(
'g_business_district c'
,
'b.business_district_id = c.id'
,
'left'
)
...
...
@@ -434,6 +434,8 @@ class OfficeGRoom extends BaseModel
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
select
();
//echo $this->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