From 4f5144d8cbd14f3bd53a988fdab6d068347bd6fe Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 五月 2025 14:44:37 +0800
Subject: [PATCH] 依赖修复
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 10 +++++++++-
ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java | 2 +-
ruoyi-admin/src/main/resources/db/beforeSql/postgresql/beforeSQL__sys.sql | 2 +-
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 10 +++++-----
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java b/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
index 196735f..eeb12f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
@@ -56,7 +56,7 @@
})
.packageConfig(builder -> {
builder.parent(BASE_PACKAGE) // 鍩虹鍖呭悕
- .moduleName(MODULE_NAME) // 妯″潡鍚�
+ .moduleName(MODULE_NAME) // 妯″潡鍚嶏紙鏍规嵁鍏蜂綋淇敼锛�
.entity("entity") // Entity鍖呭悕
.mapper("mapper") // Mapper鍖呭悕
.service("service") // Service鍖呭悕
diff --git a/ruoyi-admin/src/main/resources/db/beforeSql/postgresql/beforeSQL__sys.sql b/ruoyi-admin/src/main/resources/db/beforeSql/postgresql/beforeSQL__sys.sql
index af37cc5..346927a 100644
--- a/ruoyi-admin/src/main/resources/db/beforeSql/postgresql/beforeSQL__sys.sql
+++ b/ruoyi-admin/src/main/resources/db/beforeSql/postgresql/beforeSQL__sys.sql
@@ -231,7 +231,7 @@
is_cache INTEGER DEFAULT 0,
menu_type CHAR(1) DEFAULT '',
visible CHAR(1) DEFAULT '0',
- status CHAR(1) DEFAULT '0',
+ status INTEGER DEFAULT 0,
perms VARCHAR(100) DEFAULT NULL,
icon VARCHAR(100) DEFAULT '#',
create_by VARCHAR(64) DEFAULT '',
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 15bf66b..acc95e1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,15 +4,19 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
/**
* Entity鍩虹被
- *
+ *
* @author ruoyi
*/
+@Data
public class BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -21,6 +25,10 @@
@JsonIgnore
private String searchValue;
+ /** 閫昏緫鍒犻櫎瀛楁 */
+ @TableLogic
+ private Integer deleted;
+
/** 鍒涘缓鑰� */
private String createBy;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index d576174..94e1d06 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -29,7 +29,7 @@
</resultMap>
<sql id="selectMenuVo">
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, COALESCE(perms,'') as perms, icon, create_time
+ select menu_id, menu_name, parent_id, order_num, path, component, "query", route_name, is_frame, is_cache, menu_type, visible, status, COALESCE(perms,'') as perms, icon, create_time
from sys_menu
</sql>
@@ -51,7 +51,7 @@
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m."query", m.route_name, m.visible, m.status, COALESCE(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+ from sys_menu m where m.menu_type in ('M', 'C') and m.status = '0'
order by m.parent_id, m.order_num
</select>
@@ -81,7 +81,7 @@
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
+ where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = '0' AND ro.status = '0'
order by m.parent_id, m.order_num
</select>
@@ -141,7 +141,7 @@
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="path != null and path != ''">path = #{path},</if>
<if test="component != null">component = #{component},</if>
- <if test="query != null">`query` = #{query},</if>
+ <if test="query != null">"query" = #{query},</if>
<if test="routeName != null">route_name = #{routeName},</if>
<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
@@ -165,7 +165,7 @@
<if test="orderNum != null">order_num,</if>
<if test="path != null and path != ''">path,</if>
<if test="component != null and component != ''">component,</if>
- <if test="query != null and query != ''">`query`,</if>
+ <if test="query != null and query != ''">"query",</if>
<if test="routeName != null">route_name,</if>
<if test="isFrame != null and isFrame != ''">is_frame,</if>
<if test="isCache != null and isCache != ''">is_cache,</if>
--
Gitblit v1.9.3