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
b834527d
Commit
b834527d
authored
Jul 20, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
cf388545
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
18 deletions
+8
-18
AppChat.php
application/chat/controller/AppChat.php
+7
-6
ChatMsg.php
application/model/ChatMsg.php
+1
-1
OrderModel.php
application/model/OrderModel.php
+0
-11
No files found.
application/chat/controller/AppChat.php
View file @
b834527d
...
...
@@ -193,16 +193,17 @@ class AppChat extends Basic
public
function
getChatHistory
()
{
$params
=
$this
->
params
;
if
(
!
isset
(
$params
[
'target_type'
])
||
!
isset
(
$params
[
'from'
])
||
!
isset
(
$params
[
'target'
]))
{
return
$this
->
response
(
ErrorCodeConst
::
ERROR_CODE_PARAM_NOT_EXIST
,
"请求参数错误"
);
}
/* $params = array(
/* $params = array(
'target_type' => 'users', // 消息类型 users 用户消息。chatgroups: 群消息,chatrooms: 聊天室消息
'from' => 'app_64
', //发送人
'target' => '1811234715
1', //接受人
'from' => 'agent_5740
', //发送人
'target' => 'agent_574
1', //接受人
'page_no' => '1', //第几页
'page_size' => '15' //每页多少条
);*/
if
(
!
isset
(
$params
[
'target_type'
])
||
!
isset
(
$params
[
'from'
])
||
!
isset
(
$params
[
'target'
]))
{
return
$this
->
response
(
ErrorCodeConst
::
ERROR_CODE_PARAM_NOT_EXIST
,
"请求参数错误"
);
}
$page_no
=
empty
(
$params
[
'page_no'
])
?
1
:
$params
[
'page_no'
];
$page_size
=
empty
(
$params
[
'page_size'
])
?
15
:
$params
[
'page_size'
];
...
...
application/model/ChatMsg.php
View file @
b834527d
...
...
@@ -74,7 +74,7 @@ class ChatMsg extends Model
->
limit
(
$page_size
)
->
page
(
$page_no
)
->
select
();
//echo $this->getLastSql();
//
echo $this->getLastSql();
return
$data
;
}
...
...
application/model/OrderModel.php
View file @
b834527d
...
...
@@ -104,16 +104,6 @@ class OrderModel extends Model
public
function
searchOrder
(
$field
,
$params
,
$where_
)
{
/* $result = $this->db_
->field($field)
->alias("a")
->join("o_report b","a.f_id = b.id","left")
->union('SELECT '.$field.' FROM o_order a left join o_report b on a.f_id = b.id where '.$params)
->where($params)
->select();*/
/* dump($params);
dump($where_);*/
//$where_ = $where_ ." and " . $params;
$sql
=
"SELECT * FROM
(
(
...
...
@@ -137,7 +127,6 @@ class OrderModel extends Model
)
) AS aaa order by aaa.id desc"
;
$result
=
$this
->
db_
->
query
(
$sql
);
//echo $this->db_->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