no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/NormChargeLogic.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.logic.material.base;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.material.base.MaterialCategoryTree;
@@ -78,8 +79,9 @@ public class NormChargeLogic {
         if (StringUtils.isBlank(bean.getNormType())) {
             throw new RemoteServiceException("收费类型不能为空");
         }
-
-        bean.setNormId(null);
+        if (StringUtils.isBlank(bean.getNormId())) {
+            bean.setNormId(IdWorker.getIdStr());
+        }
 
         if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
             bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
@@ -194,11 +196,11 @@ public class NormChargeLogic {
 
         bean.updateById();
 
+        websitNormRelaService.lambdaUpdate()
+                .eq(WebsitNormRela::getCompanyWechatId, bean.getCompanyWechatId())
+                .eq(WebsitNormRela::getNormId, bean.getNormId())
+                .remove();
         if (CollectionUtil.isNotEmpty(bean.getItems())) {
-            websitNormRelaService.lambdaUpdate()
-                    .eq(WebsitNormRela::getCompanyWechatId, bean.getCompanyWechatId())
-                    .eq(WebsitNormRela::getNormId, bean.getNormId())
-                    .remove();
             for (WebsitNormRela item : bean.getItems()) {
                 item.setCompanyWechatId(bean.getCompanyWechatId())
                         .setNormId(bean.getNormId());