修复parentId 为空时的默认赋值

db/cms_navigation.sql

@@ -9,19 +9,17 @@ CREATE TABLE `cms_navigation` (
     PRIMARY KEY (`id`),
     `id` BIGINT AUTO_INCREMENT COMMENT 'ID',
     `parent_id` BIGINT DEFAULT '-1' COMMENT '父ID',
-    `uid` VARCHAR(36) NOT NULL COMMENT 'UID',
     `sort` INT DEFAULT '1' COMMENT '排序',
-    `is_blank` TINYINT(1) DEFAULT '-1' COMMENT '是否跳转窗口 (-1否, 1是)',
-    UNIQUE KEY `uid_unique` (`uid`)
+    `is_blank` TINYINT(1) DEFAULT '-1' COMMENT '是否跳转窗口 (-1否, 1是)'
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='导航表';
 
-INSERT INTO cms_navigation(parent_id, uid, sort, is_blank) VALUES
-    (-1, 'c605271df4', 6, -1),
-        (1, '6d24a51067', 1, 1),
-        (1, 'f34f0b2b99', 2, -1),
-    (-1, '3f482604bc', 1, -1),
-    (-1, '8920b8e8e4', 4, -1),
-    (-1, 'bb897b34d9', 3, -1),
-    (-1, 'b86f989757', 2, -1),
-    (-1, '6e9d24eb8a', 5, -1)
+INSERT INTO cms_navigation(parent_id, sort, is_blank) VALUES
+    (-1, 6, -1),
+        (1, 1, 1),
+        (1, 2, -1),
+    (-1, 1, -1),
+    (-1, 4, -1),
+    (-1, 3, -1),
+    (-1, 2, -1),
+    (-1, 5, -1)
 ;

src/main/java/com/backendsys/modules/cms/article/service/impl/ArticleCategoryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.backendsys.modules.cms.article.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.backendsys.exception.CustException;
 import com.backendsys.modules.cms.article.dao.ArticleCategoryDao;
 import com.backendsys.modules.cms.article.dao.ArticleCategoryI18nDao;
@@ -89,6 +90,7 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService {
         if (detail == null) throw new CustException("资讯分类不存在");
 
         // 更新
+        if (ObjectUtil.isEmpty(articleCategory.getParent_id())) articleCategory.setParent_id(-1L);
         articleCategory.setId(article_category_id);
         articleCategoryDao.updateById(articleCategory);
 

src/main/java/com/backendsys/modules/cms/navigation/entity/Navigation.java

@@ -40,7 +40,6 @@ public class Navigation {
     private List<NavigationI18n> translations;
 
     private Long parent_id;
-    private String uid;
 
     @TableField(insertStrategy = FieldStrategy.DEFAULT)
     @Range(min = 1, max = 9999, message = "排序必须在 {min} 到 {max} 之间", groups = { Create.class, Update.class })

src/main/java/com/backendsys/modules/cms/navigation/service/impl/NavigationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.backendsys.modules.cms.navigation.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.backendsys.exception.CustException;
 import com.backendsys.modules.cms.article.entity.ArticleCategoryI18n;
 import com.backendsys.modules.cms.navigation.dao.NavigationDao;
@@ -64,9 +65,6 @@ public class NavigationServiceImpl implements NavigationService {
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> insertNavigation(Navigation navigation) {
 
-        // 生成随机UUID
-        navigation.setUid(IdUtil.simpleUUID().substring(0, 10));
-
         // 插入
         navigationDao.insert(navigation);
         Long navigation_id = navigation.getId();
@@ -93,6 +91,7 @@ public class NavigationServiceImpl implements NavigationService {
         if (navigationDetail == null) throw new CustException("导航不存在");
 
         // 更新
+        if (ObjectUtil.isEmpty(navigation.getParent_id())) navigation.setParent_id(-1L);
         navigation.setId(navigation_id);
         navigationDao.updateById(navigation);
 

src/main/resources/mapper/cms/navigation/NavigationDao.xml

@@ -6,7 +6,6 @@
         n.id id,
         n.id navigation_id,
         n.parent_id parent_id,
-        n.uid uid,
         nt.navigation_name navigation_name,
         COALESCE(nt.link, '') link,
         n.sort sort,
@@ -16,7 +15,6 @@
     <sql id="includeNavigationDetail">
         n.id id,
         n.id navigation_id,
-        n.uid uid,
         n.parent_id parent_id,
         n.sort sort,
         n.is_blank is_blank
@@ -30,7 +28,6 @@
         <id property="id" column="id" jdbcType="BIGINT" />
         <result property="navigation_id" column="navigation_id" javaType="java.lang.Long" />
         <result property="parent_id" column="parent_id" javaType="java.lang.Long" />
-        <result property="uid" column="uid" />
         <result property="navigation_name" column="navigation_name" />
         <result property="link" column="link" />
         <result property="sort" column="sort" javaType="java.lang.Integer" />
@@ -41,7 +38,6 @@
         <id property="id" column="id" jdbcType="BIGINT" />
         <result property="navigation_id" column="navigation_id" javaType="java.lang.Long" />
         <result property="parent_id" column="parent_id" javaType="java.lang.Long" />
-        <result property="uid" column="uid" />
         <result property="navigation_name" column="navigation_name" />
         <result property="link" column="link" />
         <result property="sort" column="sort" javaType="java.lang.Integer" />
@@ -79,9 +75,6 @@
         SELECT <include refid="includeNavigationDetail" />
         FROM cms_navigation n
         <where>
-            <if test="uid != null and uid != ''">
-                AND n.uid = #{uid}
-            </if>
             <if test="navigation_id != null and navigation_id != ''">
                 AND n.id = #{navigation_id}
             </if>
@@ -100,7 +93,7 @@
 <!--        SELECT <include refid="includeNavigation" />-->
 <!--        FROM cms_navigation n-->
 <!--        <include refid="leftJoinTranslations" />-->
-<!--        WHERE n.uid = #{uid} AND nt.language = #{lang}-->
+<!--        WHERE nt.language = #{lang}-->
 <!--    </select>-->
 
     <!-- 创建 -->