From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 252f32c..45e9168 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,14 +1,11 @@
package com.ruoyi.generator.domain;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
@@ -23,7 +20,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table")
public class GenTable extends BaseEntity {
@@ -104,6 +100,7 @@
/**
* 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級
*/
+ @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
private String genPath;
/**
@@ -153,6 +150,12 @@
@TableField(exist = false)
private String treeName;
+ /*
+ * 鑿滃崟id鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<Long> menuIds;
+
/**
* 涓婄骇鑿滃崟ID瀛楁
*/
@@ -196,7 +199,7 @@
public static boolean isSuperColumn(String tplCategory, String javaField) {
if (isTree(tplCategory)) {
return StringUtils.equalsAnyIgnoreCase(javaField,
- ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+ ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
--
Gitblit v1.9.3