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
28fac317
Commit
28fac317
authored
Jun 25, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
error
parent
e95419b9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
OfficePayLog.php
application/index/controller/OfficePayLog.php
+2
-2
OfficeRoomService.php
application/index/service/OfficeRoomService.php
+1
-1
OfficeOPayLogModel.php
application/model/OfficeOPayLogModel.php
+1
-1
No files found.
application/index/controller/OfficePayLog.php
View file @
28fac317
...
...
@@ -797,8 +797,8 @@ class OfficePayLog extends Basic
}
if
(
$v
[
'house_id'
])
{
$house_data
=
$m_house
->
getRoomInfo
(
'a.id,b.address'
,
[
'a.id'
=>
$v
[
'house_id'
]]);
$list
[
$k
][
'house_id'
]
=
$house_data
[
'id'
];
$list
[
$k
][
'address'
]
=
$house_data
[
'address'
];
$list
[
$k
][
'house_id'
]
=
$house_data
[
0
][
'id'
];
$list
[
$k
][
'address'
]
=
$house_data
[
0
][
'address'
];
}
else
{
$list
[
$k
][
'house_id'
]
=
''
;
$list
[
$k
][
'address'
]
=
''
;
...
...
application/index/service/OfficeRoomService.php
View file @
28fac317
...
...
@@ -1636,7 +1636,7 @@ class OfficeRoomService
if
(
!
empty
(
$remark
))
{
$m_operating
=
new
OfficeGOperatingRecord
();
$m_operating
->
record
(
$agent_id
,
2
,
$remark
,
$data
[
'id'
]);
$m_operating
->
record
(
$agent_id
,
2
,
implode
(
','
,
$remark
)
,
$data
[
'id'
]);
}
return
;
...
...
application/model/OfficeOPayLogModel.php
View file @
28fac317
...
...
@@ -542,7 +542,7 @@ class OfficeOPayLogModel extends Model
public
function
getOrderHouse
(
$field
,
$where
)
{
return
$this
->
db_
->
alias
(
'a'
)
->
field
(
$field
)
->
join
(
'o_order b'
,
'a.order_id=b.id'
,
'left'
)
->
join
(
'o
ffice_o
_order b'
,
'a.order_id=b.id'
,
'left'
)
->
join
(
'office_g_room c'
,
'b.house_id=c.id'
,
'left'
)
->
join
(
'office_g_building d'
,
'c.building_id=d.id'
,
'left'
)
->
where
(
$where
)
...
...
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