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
af399702
Commit
af399702
authored
Aug 14, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
48e5fdb8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
AttentionShop.php
application/api/controller/AttentionShop.php
+1
-1
OfficeRoomApiService.php
application/api/service/OfficeRoomApiService.php
+4
-2
AttentionModel.php
application/model/AttentionModel.php
+2
-3
No files found.
application/api/controller/AttentionShop.php
View file @
af399702
...
...
@@ -142,7 +142,7 @@ class AttentionShop extends Basic
return
$this
->
response
(
"101"
,
"用户id不能为空"
);
}
$s_office_room
=
new
OfficeRoomApiService
();
$result
=
$s_office_room
->
attentionOfficeList
(
$
this
->
params
);
$result
=
$s_office_room
->
attentionOfficeList
(
$params
);
if
(
$result
[
'status'
]
==
'successful'
)
{
return
$this
->
response
(
"200"
,
"success"
,
$result
[
'data'
]);
...
...
application/api/service/OfficeRoomApiService.php
View file @
af399702
...
...
@@ -218,11 +218,13 @@ class OfficeRoomApiService
$m_attention
=
new
AttentionModel
();
$field
=
"b.id,c.disc,c.title,c.address,d.name as business_name,b.building_id,b.price,b.price_total,c.status,b.is_rent"
;
$params
[
"a.type"
]
=
0
;
$params_
[
"a.type"
]
=
1
;
$params_
[
"a.is_del"
]
=
0
;
$params_
[
"a.user_id"
]
=
$params
[
"user_id"
];
$order_
=
'a.create_time desc'
;
try
{
$result
=
$m_attention
->
myOfficeAttentionList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$params
);
$result
=
$m_attention
->
myOfficeAttentionList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$params
_
);
}
catch
(
\Exception
$e
)
{
$result
[
'status'
]
=
'fail'
;
$result
[
'msg'
]
=
$e
->
getMessage
();
...
...
application/model/AttentionModel.php
View file @
af399702
...
...
@@ -117,12 +117,11 @@ class AttentionModel extends Model
* @param int $pageSize
* @param string $order_
* @param $field
* @param $param
* @param $param
s
* @return false|\PDOStatement|string|\think\Collection
*/
public
function
myOfficeAttentionList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'a.id desc'
,
$field
,
$param
)
public
function
myOfficeAttentionList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'a.id desc'
,
$field
,
$param
s
)
{
$params
[
"a.is_del"
]
=
0
;
return
$this
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
'office_g_room b'
,
'a.house_id = b.id'
,
'left'
)
...
...
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