cup 3 年之前
父节点
当前提交
84dd2729b1

+ 6 - 4
mp-service/src/main/java/com/qs/mp/common/service/impl/ShippingTemplateServiceImpl.java

@@ -58,11 +58,13 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
 
         // 清除原来运费模板规则地区
         List<ShippingTemplateRule> shippingTemplateRules = shippingTemplateRuleService.list(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, id));
-        for (ShippingTemplateRule shippingTemplateRule : shippingTemplateRules) {
-            shippingTemplateRuleAreaService.remove(new LambdaQueryWrapper<ShippingTemplateRuleArea>().eq(ShippingTemplateRuleArea::getShippingTemplateRuleId, shippingTemplateRule.getId()));
+        if (!CollectionUtils.isEmpty(shippingTemplateRules)) {
+            for (ShippingTemplateRule shippingTemplateRule : shippingTemplateRules) {
+                shippingTemplateRuleAreaService.remove(new LambdaQueryWrapper<ShippingTemplateRuleArea>().eq(ShippingTemplateRuleArea::getShippingTemplateRuleId, shippingTemplateRule.getId()));
+            }
+            // 清除原来的运费模板规则
+            shippingTemplateRuleService.remove(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, id));
         }
-        // 清除原来的运费模板规则
-        shippingTemplateRuleService.remove(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, id));
 
         // 删除运费模板
         this.removeById(id);