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
ad789bbf
Commit
ad789bbf
authored
Sep 02, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
ba8d6fdb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
OfficePayLog.php
application/index/controller/OfficePayLog.php
+4
-1
PayLog.php
application/index/controller/PayLog.php
+1
-1
No files found.
application/index/controller/OfficePayLog.php
View file @
ad789bbf
...
@@ -191,6 +191,10 @@ class OfficePayLog extends Basic
...
@@ -191,6 +191,10 @@ class OfficePayLog extends Basic
$where
[]
=
[
'EXP'
,
'(select id from o_paylog_adjustment where paylog_id=a.id and is_del = 0 group by paylog_id) is null '
];
$where
[]
=
[
'EXP'
,
'(select id from o_paylog_adjustment where paylog_id=a.id and is_del = 0 group by paylog_id) is null '
];
}
}
if
(
!
empty
(
$params
[
'is_del'
]))
{
$where
[
'a.is_del'
]
=
$params
[
'is_del'
];
}
return
$where
;
return
$where
;
}
}
...
@@ -303,7 +307,6 @@ class OfficePayLog extends Basic
...
@@ -303,7 +307,6 @@ class OfficePayLog extends Basic
$data
=
[];
$data
=
[];
$where
=
$this
->
buildWhere
(
$this
->
params
);
$where
=
$this
->
buildWhere
(
$this
->
params
);
$where
[
'a.is_del'
]
=
0
;
$msg
=
''
;
$msg
=
''
;
try
{
try
{
$order
=
new
OfficeOPayLogModel
();
$order
=
new
OfficeOPayLogModel
();
...
...
application/index/controller/PayLog.php
View file @
ad789bbf
...
@@ -271,7 +271,7 @@ class PayLog extends Basic
...
@@ -271,7 +271,7 @@ class PayLog extends Basic
}
}
if
(
!
empty
(
$params
[
'is_del'
]))
{
if
(
!
empty
(
$params
[
'is_del'
]))
{
$where
[
'a.is_del'
]
=
1
;
$where
[
'a.is_del'
]
=
$params
[
'is_del'
]
;
}
}
return
$where
;
return
$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