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
14250637
Commit
14250637
authored
Jul 10, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
6cff2598
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
AppChat.php
application/chat/controller/AppChat.php
+1
-1
ChatRelation.php
application/model/ChatRelation.php
+1
-1
No files found.
application/chat/controller/AppChat.php
View file @
14250637
...
@@ -322,7 +322,7 @@ class AppChat extends Basic
...
@@ -322,7 +322,7 @@ class AppChat extends Basic
public
function
getChatRelation
()
public
function
getChatRelation
()
{
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/*
$params = array(
/*
$params = array(
"target" => "agent_5775"
"target" => "agent_5775"
);*/
);*/
if
(
!
isset
(
$params
[
'target'
]))
{
if
(
!
isset
(
$params
[
'target'
]))
{
...
...
application/model/ChatRelation.php
View file @
14250637
...
@@ -78,7 +78,7 @@ class ChatRelation extends Model
...
@@ -78,7 +78,7 @@ class ChatRelation extends Model
$whereOr_
[
"disable"
]
=
0
;
$whereOr_
[
"disable"
]
=
0
;
return
$this
->
field
(
$field
)
return
$this
->
field
(
$field
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"chat_user b"
,
"a.to_id !=
$only_id
and a.to_id=b.only_id or a.from_id=b.only_id"
,
"left"
)
->
join
(
"chat_user b"
,
"a.to_id !=
'"
.
$only_id
.
"'
and a.to_id=b.only_id or a.from_id=b.only_id"
,
"left"
)
->
join
(
"a_agents c"
,
"b.type = 1 and b.id = c.id"
,
"left"
)
->
join
(
"a_agents c"
,
"b.type = 1 and b.id = c.id"
,
"left"
)
->
join
(
"u_users d"
,
"b.type =2 and b.id=d.id"
,
"left"
)
->
join
(
"u_users d"
,
"b.type =2 and b.id=d.id"
,
"left"
)
->
where
(
$where_
)
->
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