From 7980ed5f6ff9ca68514290af1a2703614496b007 Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Sun, 28 Sep 2025 20:20:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=A5=97=E9=A4=90=E6=9C=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E4=B8=8D=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ZcCarModelController.java | 88 ++++++++++--------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarModelController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarModelController.java index f538f86..b17cc22 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarModelController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcCarModelController.java @@ -108,31 +108,33 @@ public class ZcCarModelController extends BaseController { return error("新增失败，该车型已存在"); } - String[] stringArray = rentCarRuleIds.stream() - .map(String::valueOf) - .toArray(String[]::new); - List carRuleList = zcRentCarRuleService.selectZcRentCarRuleByIds(stringArray); + if(rentCarRuleIds.size() > 0){ + String[] stringArray = rentCarRuleIds.stream() + .map(String::valueOf) + .toArray(String[]::new); + List carRuleList = zcRentCarRuleService.selectZcRentCarRuleByIds(stringArray); - // 按类型分组 - Map> typeGroups = carRuleList.stream() - .collect(Collectors.groupingBy(ZcRentCarRule::getRentalType)); + // 按类型分组 + Map> typeGroups = carRuleList.stream() + .collect(Collectors.groupingBy(ZcRentCarRule::getRentalType)); - // 检查类型1、2、4的重复 - boolean hasDuplicateCommon = typeGroups.entrySet().stream() - .filter(entry -> !"3".equals(entry.getKey())) // 排除类型3 - .anyMatch(entry -> entry.getValue().size() > 1); + // 检查类型1、2、4的重复 + boolean hasDuplicateCommon = typeGroups.entrySet().stream() + .filter(entry -> !"3".equals(entry.getKey())) // 排除类型3 + .anyMatch(entry -> entry.getValue().size() > 1); - if (hasDuplicateCommon) { - return error("新增失败，同一车型不允许设置相同类型套餐。"); - } + if (hasDuplicateCommon) { + return error("新增失败，同一车型不允许设置相同类型套餐。"); + } - // 专门检查类型3的租赁天数重复 - List type3Rules = typeGroups.get("3"); - if (type3Rules != null) { - Set rentalDaysSet = new HashSet<>(); - for (ZcRentCarRule rule : type3Rules) { - if (!rentalDaysSet.add(rule.getRentalDays())) { - return error("新增失败，同一车型不允许设置相同租赁天数的按天租套餐."); + // 专门检查类型3的租赁天数重复 + List type3Rules = typeGroups.get("3"); + if (type3Rules != null) { + Set rentalDaysSet = new HashSet<>(); + for (ZcRentCarRule rule : type3Rules) { + if (!rentalDaysSet.add(rule.getRentalDays())) { + return error("新增失败，同一车型不允许设置相同租赁天数的按天租套餐."); + } } } } @@ -173,31 +175,33 @@ public class ZcCarModelController extends BaseController { return error("修改失败，该车型已存在"); } - String[] stringArray = rentCarRuleIds.stream() - .map(String::valueOf) - .toArray(String[]::new); - List carRuleList = zcRentCarRuleService.selectZcRentCarRuleByIds(stringArray); + if(rentCarRuleIds.size() > 0) { + String[] stringArray = rentCarRuleIds.stream() + .map(String::valueOf) + .toArray(String[]::new); + List carRuleList = zcRentCarRuleService.selectZcRentCarRuleByIds(stringArray); - // 按类型分组 - Map> typeGroups = carRuleList.stream() - .collect(Collectors.groupingBy(ZcRentCarRule::getRentalType)); + // 按类型分组 + Map> typeGroups = carRuleList.stream() + .collect(Collectors.groupingBy(ZcRentCarRule::getRentalType)); - // 检查类型1、2、4的重复 - boolean hasDuplicateCommon = typeGroups.entrySet().stream() - .filter(entry -> !"3".equals(entry.getKey())) // 排除类型3 - .anyMatch(entry -> entry.getValue().size() > 1); + // 检查类型1、2、4的重复 + boolean hasDuplicateCommon = typeGroups.entrySet().stream() + .filter(entry -> !"3".equals(entry.getKey())) // 排除类型3 + .anyMatch(entry -> entry.getValue().size() > 1); - if (hasDuplicateCommon) { - return error("新增失败，同一车型不允许设置相同类型套餐。"); - } + if (hasDuplicateCommon) { + return error("新增失败，同一车型不允许设置相同类型套餐。"); + } - // 专门检查类型3的租赁天数重复 - List type3Rules = typeGroups.get("3"); - if (type3Rules != null) { - Set rentalDaysSet = new HashSet<>(); - for (ZcRentCarRule rule : type3Rules) { - if (!rentalDaysSet.add(rule.getRentalDays())) { - return error("新增失败，同一车型不允许设置相同租赁天数的按天租套餐."); + // 专门检查类型3的租赁天数重复 + List type3Rules = typeGroups.get("3"); + if (type3Rules != null) { + Set rentalDaysSet = new HashSet<>(); + for (ZcRentCarRule rule : type3Rules) { + if (!rentalDaysSet.add(rule.getRentalDays())) { + return error("新增失败，同一车型不允许设置相同租赁天数的按天租套餐."); + } } } }