From a29112f6995474bf47d247b913b60d5c92448279 Mon Sep 17 00:00:00 2001
From: xuyuxiang <xuyuxiang29@foxmail.com>
Date: Thu, 15 May 2025 22:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=B0=E5=A2=9E=E8=B5=84=E6=BA=90=E6=97=B6code?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/service/impl/MobileButtonServiceImpl.java       | 5 ++++-
 .../modular/resource/service/impl/MobileMenuServiceImpl.java | 4 +++-
 .../resource/service/impl/MobileModuleServiceImpl.java       | 4 +++-
 .../modular/resource/service/impl/SysButtonServiceImpl.java  | 4 +++-
 .../modular/resource/service/impl/SysMenuServiceImpl.java    | 4 +++-
 .../modular/resource/service/impl/SysModuleServiceImpl.java  | 4 +++-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java
index df04dce3..6fe0f560 100644
--- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java
@@ -15,6 +15,7 @@ package vip.xiaonuo.mobile.modular.resource.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -85,7 +86,9 @@ public class MobileButtonServiceImpl extends ServiceImpl<MobileButtonMapper, Mob
         if(repeatCode) {
             throw new CommonException("存在重复的移动端按钮，编码为：{}", mobileButton.getCode());
         }
-        mobileButton.setCategory(MobileResourceCategoryEnum.BUTTON.getValue());
+        if(ObjectUtil.isEmpty(mobileButton.getCode())) {
+            mobileButton.setCode(RandomUtil.randomString(10));
+        }
         this.save(mobileButton);
     }
 
diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
index 0bcaf561..514386b7 100644
--- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
@@ -99,7 +99,9 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
                 throw new CommonException("module与上级菜单不一致");
             }
         }
-        mobileMenu.setCode(RandomUtil.randomString(10));
+        if(ObjectUtil.isEmpty(mobileMenu.getCode())) {
+            mobileMenu.setCode(RandomUtil.randomString(10));
+        }
         mobileMenu.setCategory(MobileResourceCategoryEnum.MENU.getValue());
         this.save(mobileMenu);
     }
diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java
index ccc3c384..a56abd63 100644
--- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileModuleServiceImpl.java
@@ -88,7 +88,9 @@ public class MobileModuleServiceImpl extends ServiceImpl<MobileModuleMapper, Mob
         if(ObjectUtil.isEmpty(mobileModule.getCode())){
             mobileModule.setCode(RandomUtil.randomString(10));
         }
-        mobileModule.setCode(RandomUtil.randomString(10));
+        if(ObjectUtil.isEmpty(mobileModule.getCode())) {
+            mobileModule.setCode(RandomUtil.randomString(10));
+        }
         mobileModule.setCategory(MobileResourceCategoryEnum.MODULE.getValue());
         this.save(mobileModule);
     }
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java
index 58567add..476b9906 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java
@@ -97,7 +97,9 @@ public class SysButtonServiceImpl extends ServiceImpl<SysButtonMapper, SysButton
         if(repeatCode) {
             throw new CommonException("存在重复的按钮，编码为：{}", sysButton.getCode());
         }
-        sysButton.setCode(RandomUtil.randomString(10));
+        if(ObjectUtil.isEmpty(sysButton.getCode())) {
+            sysButton.setCode(RandomUtil.randomString(10));
+        }
         sysButton.setCategory(SysResourceCategoryEnum.BUTTON.getValue());
         this.save(sysButton);
 
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java
index 35395609..8b3db421 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java
@@ -165,7 +165,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                 throw new CommonException("module与上级菜单不一致");
             }
         }
-        sysMenu.setCode(RandomUtil.randomString(10));
+        if(ObjectUtil.isEmpty(sysMenu.getCode())) {
+            sysMenu.setCode(RandomUtil.randomString(10));
+        }
         sysMenu.setCategory(SysResourceCategoryEnum.MENU.getValue());
         this.save(sysMenu);
 
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java
index ad6b367c..afc4540a 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java
@@ -92,7 +92,9 @@ public class SysModuleServiceImpl extends ServiceImpl<SysModuleMapper, SysModule
         if(repeatTitle) {
             throw new CommonException("存在重复的模块，名称为：{}", sysModule.getTitle());
         }
-        sysModule.setCode(RandomUtil.randomString(10));
+        if(ObjectUtil.isEmpty(sysModule.getCode())) {
+            sysModule.setCode(RandomUtil.randomString(10));
+        }
         sysModule.setCategory(SysResourceCategoryEnum.MODULE.getValue());
         this.save(sysModule);
         // 发布增加事件