canrd-outside / order-erp · Commits

Commit 59b8a1e2fefd5cc95c89895d33a6aa9b318b2e29

Authored by qdlgxiemaosheng
1 parent 2ced8971
build: skipped

fixbug

Inline Side-by-side
Showing 11 changed files with 13 additions and 13 deletions
src/main/java/com/order/erp/common/utils/PageUtils.java
  View file @59b8a1e
... ... @@ -64,7 +64,7 @@ public class PageUtils implements Serializable {
64 64 }
65 65  
66 66 public static Map<String, Object> getUnifiedEmptyPage(BasePageVO pageVO) {
67   - return getUnifiedEmptyPage(pageVO.getPageNo(), pageVO.getPageSize());
  67 + return getUnifiedEmptyPage(pageVO.getPage(), pageVO.getPageSize());
68 68 }
69 69  
70 70  
... ... @@ -98,10 +98,10 @@ public class PageUtils implements Serializable {
98 98 return getUnifiedEmptyPage(DEFAULT_PAGE_INDEX, DEFAULT_PAGE_SIZE);
99 99 }
100 100 if (CollectionUtils.isEmpty(records)) {
101   - return getUnifiedEmptyPage(Math.toIntExact(pageVO.getPageNo()), Math.toIntExact(pageVO.getPageSize()));
  101 + return getUnifiedEmptyPage(Math.toIntExact(pageVO.getPage()), Math.toIntExact(pageVO.getPageSize()));
102 102 }
103 103 Map<String, Object> resultMap = new HashMap<>(DEFAULT_MAP_CAPACITY);
104   - resultMap.put(PAGE_INDEX, pageVO.getPageNo());
  104 + resultMap.put(PAGE_INDEX, pageVO.getPage());
105 105 resultMap.put(PAGE_SIZE, pageVO.getPageSize());
106 106 resultMap.put(RECORDS, records);
107 107 resultMap.put(TOTAL_PAGES, (pageVO.getTotal() + pageVO.getPageSize() - 1) / pageVO.getPageSize());
... ...
src/main/java/com/order/erp/domain/vo/BasePageVO.java
  View file @59b8a1e
... ... @@ -25,7 +25,7 @@ public class BasePageVO {
25 25 @JsonInclude(JsonInclude.Include.NON_NULL)
26 26 @NotNull(message = "页码不能为空", groups = {OperateGroup.List.class})
27 27 @Min(value = Constant.ONE, message = "页码不能小于1", groups = {OperateGroup.List.class})
28   - private Integer pageNo = 1;
  28 + private Integer page = 1;
29 29 /**
30 30 * 页
31 31 */
... ...
src/main/java/com/order/erp/service/admin/impl/AdminDeptServiceImpl.java
  View file @59b8a1e
... ... @@ -66,7 +66,7 @@ public class AdminDeptServiceImpl extends ServiceImpl&lt;AdminDeptMapper, AdminDept
66 66 public ServerResult list(AdminDeptQueryVO queryVO) {
67 67  
68 68 LambdaQueryWrapper<AdminDeptDO> queryWrapper = buildQueryByParam(queryVO);
69   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  69 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
70 70 IPage<AdminDeptDO> iPage = page(page, queryWrapper);
71 71  
72 72 Page<AdminDeptResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/admin/impl/AdminJobServiceImpl.java
  View file @59b8a1e
... ... @@ -66,7 +66,7 @@ public class AdminJobServiceImpl extends ServiceImpl&lt;AdminJobMapper, AdminJobDO&gt;
66 66 public ServerResult list(AdminJobQueryVO queryVO) {
67 67  
68 68 LambdaQueryWrapper<AdminJobDO> queryWrapper = buildQueryByParam(queryVO);
69   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  69 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
70 70 IPage<AdminJobDO> iPage = page(page, queryWrapper);
71 71  
72 72 Page<AdminJobResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/admin/impl/AdminRoleServiceImpl.java
  View file @59b8a1e
... ... @@ -91,7 +91,7 @@ public class AdminRoleServiceImpl extends ServiceImpl&lt;AdminRoleMapper, AdminRole
91 91 @Override
92 92 public ServerResult listByPage(AdminRoleQueryVO queryVO) {
93 93 LambdaQueryWrapper<AdminRoleDO> queryWrapper = buildQueryByParam(queryVO);
94   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  94 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
95 95 IPage<AdminRoleDO> iPage = page(page, queryWrapper);
96 96  
97 97 Page<AdminRoleResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
  View file @59b8a1e
... ... @@ -125,7 +125,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
125 125 public ServerResult list(AdminUserQueryVO queryVO) {
126 126  
127 127 LambdaQueryWrapper<AdminUserDO> queryWrapper = buildQueryByParam(queryVO);
128   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  128 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
129 129 IPage<AdminUserDO> iPage = page(page, queryWrapper);
130 130  
131 131 Page<AdminUserResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/admin/impl/DictionaryServiceImpl.java
  View file @59b8a1e
... ... @@ -72,7 +72,7 @@ public class DictionaryServiceImpl extends ServiceImpl&lt;DictionaryMapper, Diction
72 72 public ServerResult listByPage(DictionaryQueryVO queryVO) {
73 73  
74 74 LambdaQueryWrapper<DictionaryDO> queryWrapper = buildQueryByParam(queryVO);
75   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  75 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
76 76 IPage<DictionaryDO> iPage = page(page, queryWrapper);
77 77  
78 78 Page<DictionaryResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/order/impl/OrderAuditLogServiceImpl.java
  View file @59b8a1e
... ... @@ -81,7 +81,7 @@ public class OrderAuditLogServiceImpl extends ServiceImpl&lt;OrderAuditLogMapper, O
81 81 @Override
82 82 public ServerResult listByPage(OrderAuditLogQueryVO queryVO) {
83 83 LambdaQueryWrapper<OrderAuditLogDO> queryWrapper = buildQueryByParam(queryVO);
84   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  84 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
85 85 IPage<OrderAuditLogDO> iPage = page(page, queryWrapper);
86 86  
87 87 Page<OrderAuditLogResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @59b8a1e
... ... @@ -131,7 +131,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
131 131 @Override
132 132 public ServerResult listByPage(OrderBaseInfoQueryVO queryVO) {
133 133 LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = buildQueryByParam(queryVO);
134   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  134 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
135 135 IPage<OrderBaseInfoDO> iPage = page(page, queryWrapper);
136 136  
137 137 Page<OrderInfoResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @59b8a1e
... ... @@ -106,7 +106,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
106 106 @Override
107 107 public ServerResult listByPage(OrderFieldLockApplyQueryVO queryVO) {
108 108 LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = buildQueryByParam(queryVO);
109   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  109 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
110 110 IPage<OrderFieldLockApplyDO> iPage = page(page, queryWrapper);
111 111  
112 112 Page<OrderApplyResultVO> webVOPage = new Page<>();
... ...
src/main/java/com/order/erp/service/order/impl/OrderOptLogServiceImpl.java
  View file @59b8a1e
... ... @@ -76,7 +76,7 @@ public class OrderOptLogServiceImpl extends ServiceImpl&lt;OrderOptLogMapper, Order
76 76 @Override
77 77 public ServerResult listByPage(OrderOptLogQueryVO queryVO) {
78 78 LambdaQueryWrapper<OrderOptLogDO> queryWrapper = buildQueryByParam(queryVO);
79   - Page page = new Page<>(queryVO.getPageNo(), queryVO.getPageSize());
  79 + Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
80 80 IPage<OrderOptLogDO> iPage = page(page, queryWrapper);
81 81  
82 82 Page<OrderOptLogResultVO> webVOPage = new Page<>();
... ...