Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
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
external
on-site-service
Commits
2e50ae02
Commit
2e50ae02
authored
Jul 27, 2022
by
lining
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 分页失效问题
parent
43e292b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
ServiceOrderBizService.java
...service/miniapp/service/order/ServiceOrderBizService.java
+2
-4
No files found.
mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java
View file @
2e50ae02
...
@@ -136,8 +136,6 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
...
@@ -136,8 +136,6 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
public
Result
<
PageInfoVO
<
ServiceOrderVO
>>
getPage
(
PageServiceOrderDTO
dto
,
Long
userId
)
{
public
Result
<
PageInfoVO
<
ServiceOrderVO
>>
getPage
(
PageServiceOrderDTO
dto
,
Long
userId
)
{
log
.
info
(
"order getPage dto: {}, userId: {}"
,
dto
,
userId
);
log
.
info
(
"order getPage dto: {}, userId: {}"
,
dto
,
userId
);
PageHelper
.
startPage
(
dto
.
getPage
(),
dto
.
getSize
());
User
user
=
userMapper
.
selectByPrimaryKey
(
userId
);
User
user
=
userMapper
.
selectByPrimaryKey
(
userId
);
if
(
Objects
.
isNull
(
user
)
if
(
Objects
.
isNull
(
user
)
||
(!
user
.
getRoleType
().
equals
(
ServiceUserTypeEnum
.
ADMIN
.
getId
())
&&
!
user
.
getRoleType
().
equals
(
ServiceUserTypeEnum
.
VALUATOR
.
getId
())))
{
||
(!
user
.
getRoleType
().
equals
(
ServiceUserTypeEnum
.
ADMIN
.
getId
())
&&
!
user
.
getRoleType
().
equals
(
ServiceUserTypeEnum
.
VALUATOR
.
getId
())))
{
...
@@ -148,6 +146,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
...
@@ -148,6 +146,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
throw
new
ServiceException
(
BizCodeEnum
.
SERVICE_ORDER_STATUS_ERROR
);
throw
new
ServiceException
(
BizCodeEnum
.
SERVICE_ORDER_STATUS_ERROR
);
}
}
PageHelper
.
startPage
(
dto
.
getPage
(),
dto
.
getSize
());
List
<
ServiceOrder
>
serviceOrderList
=
serviceOrderMapper
.
selectServiceOrderPage
(
List
<
ServiceOrder
>
serviceOrderList
=
serviceOrderMapper
.
selectServiceOrderPage
(
BizConstants
.
OrderConstants
.
FRONT_BACK_ORDER_STATUS_MAP
.
get
(
dto
.
getOrderStatus
()),
BizConstants
.
OrderConstants
.
FRONT_BACK_ORDER_STATUS_MAP
.
get
(
dto
.
getOrderStatus
()),
dto
.
getMonth
(),
dto
.
getMonth
(),
...
@@ -162,12 +161,11 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
...
@@ -162,12 +161,11 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
public
Result
<
PageInfoVO
<
ServiceOrderVO
>>
getMinePage
(
PageServiceOrderDTO
dto
,
Long
userId
)
{
public
Result
<
PageInfoVO
<
ServiceOrderVO
>>
getMinePage
(
PageServiceOrderDTO
dto
,
Long
userId
)
{
log
.
info
(
"order getMinePage dto: {}, userId: {}"
,
dto
,
userId
);
log
.
info
(
"order getMinePage dto: {}, userId: {}"
,
dto
,
userId
);
PageHelper
.
startPage
(
dto
.
getPage
(),
dto
.
getSize
());
if
(!
BizConstants
.
OrderConstants
.
FRONT_BACK_ORDER_STATUS_MAP
.
containsKey
(
dto
.
getOrderStatus
()))
{
if
(!
BizConstants
.
OrderConstants
.
FRONT_BACK_ORDER_STATUS_MAP
.
containsKey
(
dto
.
getOrderStatus
()))
{
throw
new
ServiceException
(
BizCodeEnum
.
SERVICE_ORDER_STATUS_ERROR
);
throw
new
ServiceException
(
BizCodeEnum
.
SERVICE_ORDER_STATUS_ERROR
);
}
}
PageHelper
.
startPage
(
dto
.
getPage
(),
dto
.
getSize
());
List
<
ServiceOrder
>
serviceOrderList
=
serviceOrderMapper
.
selectServiceOrderMinePage
(
List
<
ServiceOrder
>
serviceOrderList
=
serviceOrderMapper
.
selectServiceOrderMinePage
(
BizConstants
.
OrderConstants
.
FRONT_BACK_ORDER_STATUS_MAP
.
get
(
dto
.
getOrderStatus
()),
BizConstants
.
OrderConstants
.
FRONT_BACK_ORDER_STATUS_MAP
.
get
(
dto
.
getOrderStatus
()),
dto
.
getMonth
(),
dto
.
getMonth
(),
...
...
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