From 90970eb9fef42f1f02ea60c9522f4d7dd6a6c128 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 22 二月 2023 10:29:28 +0800
Subject: [PATCH] 修复isMatchedIp的参数判断产生空指针的问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 8c7c494..9f3a6f6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,7 +31,7 @@
private Long parentId;
/** 显示顺序 */
- private String orderNum;
+ private Integer orderNum;
/** 路由地址 */
private String path;
@@ -53,7 +54,7 @@
/** 显示状态（0显示 1隐藏） */
private String visible;
- /** 菜单状态（0显示 1隐藏） */
+ /** 菜单状态（0正常 1停用） */
private String status;
/** 权限字符串 */
@@ -107,13 +108,13 @@
this.parentId = parentId;
}
- @NotBlank(message = "显示顺序不能为空")
- public String getOrderNum()
+ @NotNull(message = "显示顺序不能为空")
+ public Integer getOrderNum()
{
return orderNum;
}
- public void setOrderNum(String orderNum)
+ public void setOrderNum(Integer orderNum)
{
this.orderNum = orderNum;
}
--
Gitblit v1.9.2