Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
ic_server_welfare
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
289abc04
authored
Aug 22, 2019
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修复删除integral_type表之后的bug
parent
48660cee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
7 deletions
app/Models/Integral.php
app/Models/Integral.php
View file @
289abc04
...
...
@@ -24,15 +24,9 @@ class Integral extends Model
return
$filters
->
apply
(
$query
);
}
public
function
integralType
()
{
return
$this
->
belongsTo
(
IntegralType
::
class
,
'integral_type_id'
,
'id'
);
}
public
function
getIntegralList
(
$page
,
$pageSize
,
$filter
)
{
$integrals
=
Integral
::
with
(
'integralType:id,name'
)
->
filter
(
$filter
)
$integrals
=
Integral
::
filter
(
$filter
)
->
page
(
$page
,
$pageSize
)
->
orderBy
(
'id'
,
'desc'
)
->
get
()
->
toArray
();
...
...
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