Merge branch 'master' of https://git.opsoul.com/clunt/ghy-all

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

@@ -2307,9 +2307,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());

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

@@ -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