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
1bc9186e
Commit
1bc9186e
authored
Jul 19, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同
parent
00a55cc7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
AppChat.php
application/chat/controller/AppChat.php
+1
-1
ChatService.php
application/chat/service/ChatService.php
+1
-2
No files found.
application/chat/controller/AppChat.php
View file @
1bc9186e
...
...
@@ -324,7 +324,7 @@ class AppChat extends Basic
$params
=
$this
->
params
;
/* $params = array(
"target" => "user_2",
"is_user" =>
0,//0用户1
经纪人
"is_user" =>
1,//1用户2
经纪人
"relation_list" => '[{"r_id":"2","msg_id":3536},{"r_id":"8","msg_id":3524}]',
);*/
if
(
!
isset
(
$params
[
'target'
])
||
!
isset
(
$params
[
"is_user"
]))
{
...
...
application/chat/service/ChatService.php
View file @
1bc9186e
...
...
@@ -408,7 +408,6 @@ class ChatService
$relationList
=
$chatRelationModel
->
getChatRelationInfo
(
$params
,
$field
);
$result
=
[];
//dump($relationList);
$fields
=
"a.id,a.from_id,a.to_id,b.body,b.type,a.created_at"
;
$msgModel
=
new
ChatMsg
();
foreach
(
$relationList
as
$key
=>
$item
)
{
...
...
@@ -417,7 +416,7 @@ class ChatService
}
else
{
$result
[
$key
][
"relation_id"
]
=
$item
[
"from_id"
];
}
if
(
$is_user
==
0
)
{
if
(
$is_user
==
1
)
{
$result
[
$key
][
"name"
]
=
empty
(
$item
[
"user_nick"
])
?
$item
[
"user_name"
]
:
$item
[
"user_nick"
];
$result
[
$key
][
"img"
]
=
empty
(
$item
[
"user_pic"
])
?
$item
[
"other_pic"
]
:
$item
[
"user_pic"
];
$result
[
$key
][
"phone"
]
=
$item
[
"user_phone"
];
...
...
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