clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2026-03-13 16:25:23 +08:00
parent 60ef63dfc0
commit 57fcb7161d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -2244,9 +2244,20 @@ public class OrderMasterController extends BaseController {
orderMaster.setCreateBy(this.getSysUser().getUserId().toString());
}
// 先获取总数
// 先获取总数（防御性处理空值，避免分页时拆箱 NPE
Integer pageSize= orderMaster.getPageSize();
Integer pageNum =orderMaster.getPageNum();
if (orderMaster.getProvince()==""){
orderMaster.setProvince(null);
orderMaster.setPageSize(10);
orderMaster.setPageNum(1);
}
Long total = orderMasterService.selectOrderMasterCount(orderMaster);
if (total == null) {
total = 0L;
}
orderMaster.setPageSize(pageSize);
orderMaster.setPageNum(pageNum);
startPage();
List<OrderMaster> orderMasterList = orderMasterService.selectOrderMasterList(orderMaster);
Set<Long> orderMasterIds = orderMasterList.stream().map(OrderMaster::getId).collect(Collectors.toSet());

3
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -151,7 +151,8 @@ public class OrderMasterServiceImpl implements OrderMasterService {
@Override
public Long selectOrderMasterCount(OrderMaster orderMaster) {
return orderMasterMapper.selectOrderMasterCount(orderMaster);
Long count = orderMasterMapper.selectOrderMasterCount(orderMaster);
return count;
}
@Override