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
8f4bf208
Commit
8f4bf208
authored
Dec 28, 2017
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
498da586
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
TradeLog.php
application/api/controller/TradeLog.php
+1
-1
JournalAccounts.php
application/model/JournalAccounts.php
+2
-1
No files found.
application/api/controller/TradeLog.php
View file @
8f4bf208
...
@@ -51,7 +51,7 @@ class TradeLog extends Basic
...
@@ -51,7 +51,7 @@ class TradeLog extends Basic
$order_
=
'a.created desc'
;
$order_
=
'a.created desc'
;
$field
=
"
a.
id,a.tradecode,a.singntime,b.phpone,b.house_id,b.agent_id"
;
$field
=
"
min(a.id) as
id,a.tradecode,a.singntime,b.phpone,b.house_id,b.agent_id"
;
$result
=
$this
->
journalAccountsMode
->
getJournalAccountsList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$params
);
$result
=
$this
->
journalAccountsMode
->
getJournalAccountsList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$params
);
if
(
count
(
$result
)
<=
0
)
{
if
(
count
(
$result
)
<=
0
)
{
...
...
application/model/JournalAccounts.php
View file @
8f4bf208
...
@@ -96,13 +96,14 @@ class JournalAccounts extends Model
...
@@ -96,13 +96,14 @@ class JournalAccounts extends Model
public
function
getJournalAccountsList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
,
$param
)
public
function
getJournalAccountsList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
,
$param
)
{
{
$params
[
"b.phpone"
]
=
$param
[
"phone"
];
$params
[
"b.phpone"
]
=
$param
[
"phone"
];
$params
[
"a.singntime"
]
=
array
(
"neq"
,
"null"
);
//
$params["a.singntime"] = array( "neq", "null" );
return
$this
->
db
return
$this
->
db
->
field
(
$field
)
->
field
(
$field
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
'applies b'
,
'a.apply_id = b.id'
,
'LEFT'
)
->
join
(
'applies b'
,
'a.apply_id = b.id'
,
'LEFT'
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order_
)
->
order
(
$order_
)
->
group
(
"a.apply_id"
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
page
(
$pageNo
)
->
select
();
->
select
();
...
...
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