diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
index db5d176..6d27c88 100644
--- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
+++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
@@ -223,8 +223,8 @@ public class LeaveNeedDoBizService {
         for (LeaveAllocationDTO.Allocation rule : ruleList) {
             List<UserRoleDataRangeDTO> dataRange = userService.getUserRoleDataRange(rule.getUserId(), RoleCode.FWGW);
             List<Long> shopIdList = dataRange.stream().map(UserRoleDataRangeDTO::getRangeValue).collect(Collectors.toList());
-            Long shopId = shopIdList.get(0);
             BV.isNotEmpty(shopIdList, () -> String.format("[%s]无服务接待角色，请核对", rule.getUserName()));
+            Long shopId = shopIdList.get(0);
             BV.isTrue(needDo.getShopId().equals(shopId), () -> String.format("[%s]所属门店与离职人员门店不符", rule.getUserName()));
             rule.setShopId(shopId);
         }
@@ -248,7 +248,8 @@ public class LeaveNeedDoBizService {
         final LinkedList<UserInfo> queue = new LinkedList<>();
 
         for (LeaveAllocationDTO.Allocation rule : ruleList) {
-            List<Customer> subList = customerList.subList(0, rule.getNum());
+            int size = customerList.size();
+            List<Customer> subList = customerList.subList(0, rule.getNum() > size ? size : rule.getNum());
             if (CollectionUtils.isEmpty(subList)) {
                 continue;
             }