作者 RuoYi

消除Vue3控制台出现的警告信息

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity; @@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity;
2 2
3 import java.util.Set; 3 import java.util.Set;
4 import javax.validation.constraints.NotBlank; 4 import javax.validation.constraints.NotBlank;
  5 +import javax.validation.constraints.NotNull;
5 import javax.validation.constraints.Size; 6 import javax.validation.constraints.Size;
6 import org.apache.commons.lang3.builder.ToStringBuilder; 7 import org.apache.commons.lang3.builder.ToStringBuilder;
7 import org.apache.commons.lang3.builder.ToStringStyle; 8 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -32,7 +33,7 @@ public class SysRole extends BaseEntity @@ -32,7 +33,7 @@ public class SysRole extends BaseEntity
32 33
33 /** 角色排序 */ 34 /** 角色排序 */
34 @Excel(name = "角色排序") 35 @Excel(name = "角色排序")
35 - private String roleSort; 36 + private Integer roleSort;
36 37
37 /** 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) */ 38 /** 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) */
38 @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") 39 @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
@@ -117,13 +118,13 @@ public class SysRole extends BaseEntity @@ -117,13 +118,13 @@ public class SysRole extends BaseEntity
117 this.roleKey = roleKey; 118 this.roleKey = roleKey;
118 } 119 }
119 120
120 - @NotBlank(message = "显示顺序不能为空")  
121 - public String getRoleSort() 121 + @NotNull(message = "显示顺序不能为空")
  122 + public Integer getRoleSort()
122 { 123 {
123 return roleSort; 124 return roleSort;
124 } 125 }
125 126
126 - public void setRoleSort(String roleSort) 127 + public void setRoleSort(Integer roleSort)
127 { 128 {
128 this.roleSort = roleSort; 129 this.roleSort = roleSort;
129 } 130 }
@@ -136,24 +136,9 @@ @@ -136,24 +136,9 @@
136 #end 136 #end
137 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 137 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
138 <template #default="scope"> 138 <template #default="scope">
139 - <el-button  
140 - type="text"  
141 - icon="Edit"  
142 - @click="handleUpdate(scope.row)"  
143 - v-hasPermi="['${moduleName}:${businessName}:edit']"  
144 - >修改</el-button>  
145 - <el-button  
146 - type="text"  
147 - icon="Plus"  
148 - @click="handleAdd(scope.row)"  
149 - v-hasPermi="['${moduleName}:${businessName}:add']"  
150 - >新增</el-button>  
151 - <el-button  
152 - type="text"  
153 - icon="Delete"  
154 - @click="handleDelete(scope.row)"  
155 - v-hasPermi="['${moduleName}:${businessName}:remove']"  
156 - >删除</el-button> 139 + <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
  140 + <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
  141 + <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
157 </template> 142 </template>
158 </el-table-column> 143 </el-table-column>
159 </el-table> 144 </el-table>
@@ -148,18 +148,8 @@ @@ -148,18 +148,8 @@
148 #end 148 #end
149 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 149 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
150 <template #default="scope"> 150 <template #default="scope">
151 - <el-button  
152 - type="text"  
153 - icon="Edit"  
154 - @click="handleUpdate(scope.row)"  
155 - v-hasPermi="['${moduleName}:${businessName}:edit']"  
156 - >修改</el-button>  
157 - <el-button  
158 - type="text"  
159 - icon="Delete"  
160 - @click="handleDelete(scope.row)"  
161 - v-hasPermi="['${moduleName}:${businessName}:remove']"  
162 - >删除</el-button> 151 + <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
  152 + <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
163 </template> 153 </template>
164 </el-table-column> 154 </el-table-column>
165 </el-table> 155 </el-table>
1 package com.ruoyi.system.domain; 1 package com.ruoyi.system.domain;
2 2
3 import javax.validation.constraints.NotBlank; 3 import javax.validation.constraints.NotBlank;
  4 +import javax.validation.constraints.NotNull;
4 import javax.validation.constraints.Size; 5 import javax.validation.constraints.Size;
5 import org.apache.commons.lang3.builder.ToStringBuilder; 6 import org.apache.commons.lang3.builder.ToStringBuilder;
6 import org.apache.commons.lang3.builder.ToStringStyle; 7 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,7 +32,7 @@ public class SysPost extends BaseEntity @@ -31,7 +32,7 @@ public class SysPost extends BaseEntity
31 32
32 /** 岗位排序 */ 33 /** 岗位排序 */
33 @Excel(name = "岗位排序") 34 @Excel(name = "岗位排序")
34 - private String postSort; 35 + private Integer postSort;
35 36
36 /** 状态(0正常 1停用) */ 37 /** 状态(0正常 1停用) */
37 @Excel(name = "状态", readConverterExp = "0=正常,1=停用") 38 @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
@@ -74,13 +75,13 @@ public class SysPost extends BaseEntity @@ -74,13 +75,13 @@ public class SysPost extends BaseEntity
74 this.postName = postName; 75 this.postName = postName;
75 } 76 }
76 77
77 - @NotBlank(message = "显示顺序不能为空")  
78 - public String getPostSort() 78 + @NotNull(message = "显示顺序不能为空")
  79 + public Integer getPostSort()
79 { 80 {
80 return postSort; 81 return postSort;
81 } 82 }
82 83
83 - public void setPostSort(String postSort) 84 + public void setPostSort(Integer postSort)
84 { 85 {
85 this.postSort = postSort; 86 this.postSort = postSort;
86 } 87 }
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
77 <set> 77 <set>
78 <if test="postCode != null and postCode != ''">post_code = #{postCode},</if> 78 <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
79 <if test="postName != null and postName != ''">post_name = #{postName},</if> 79 <if test="postName != null and postName != ''">post_name = #{postName},</if>
80 - <if test="postSort != null and postSort != ''">post_sort = #{postSort},</if> 80 + <if test="postSort != null">post_sort = #{postSort},</if>
81 <if test="status != null and status != ''">status = #{status},</if> 81 <if test="status != null and status != ''">status = #{status},</if>
82 <if test="remark != null">remark = #{remark},</if> 82 <if test="remark != null">remark = #{remark},</if>
83 <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> 83 <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
91 <if test="postId != null and postId != 0">post_id,</if> 91 <if test="postId != null and postId != 0">post_id,</if>
92 <if test="postCode != null and postCode != ''">post_code,</if> 92 <if test="postCode != null and postCode != ''">post_code,</if>
93 <if test="postName != null and postName != ''">post_name,</if> 93 <if test="postName != null and postName != ''">post_name,</if>
94 - <if test="postSort != null and postSort != ''">post_sort,</if> 94 + <if test="postSort != null">post_sort,</if>
95 <if test="status != null and status != ''">status,</if> 95 <if test="status != null and status != ''">status,</if>
96 <if test="remark != null and remark != ''">remark,</if> 96 <if test="remark != null and remark != ''">remark,</if>
97 <if test="createBy != null and createBy != ''">create_by,</if> 97 <if test="createBy != null and createBy != ''">create_by,</if>
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
100 <if test="postId != null and postId != 0">#{postId},</if> 100 <if test="postId != null and postId != 0">#{postId},</if>
101 <if test="postCode != null and postCode != ''">#{postCode},</if> 101 <if test="postCode != null and postCode != ''">#{postCode},</if>
102 <if test="postName != null and postName != ''">#{postName},</if> 102 <if test="postName != null and postName != ''">#{postName},</if>
103 - <if test="postSort != null and postSort != ''">#{postSort},</if> 103 + <if test="postSort != null">#{postSort},</if>
104 <if test="status != null and status != ''">#{status},</if> 104 <if test="status != null and status != ''">#{status},</if>
105 <if test="remark != null and remark != ''">#{remark},</if> 105 <if test="remark != null and remark != ''">#{remark},</if>
106 <if test="createBy != null and createBy != ''">#{createBy},</if> 106 <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
98 <if test="roleId != null and roleId != 0">role_id,</if> 98 <if test="roleId != null and roleId != 0">role_id,</if>
99 <if test="roleName != null and roleName != ''">role_name,</if> 99 <if test="roleName != null and roleName != ''">role_name,</if>
100 <if test="roleKey != null and roleKey != ''">role_key,</if> 100 <if test="roleKey != null and roleKey != ''">role_key,</if>
101 - <if test="roleSort != null and roleSort != ''">role_sort,</if> 101 + <if test="roleSort != null">role_sort,</if>
102 <if test="dataScope != null and dataScope != ''">data_scope,</if> 102 <if test="dataScope != null and dataScope != ''">data_scope,</if>
103 <if test="menuCheckStrictly != null">menu_check_strictly,</if> 103 <if test="menuCheckStrictly != null">menu_check_strictly,</if>
104 <if test="deptCheckStrictly != null">dept_check_strictly,</if> 104 <if test="deptCheckStrictly != null">dept_check_strictly,</if>
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
110 <if test="roleId != null and roleId != 0">#{roleId},</if> 110 <if test="roleId != null and roleId != 0">#{roleId},</if>
111 <if test="roleName != null and roleName != ''">#{roleName},</if> 111 <if test="roleName != null and roleName != ''">#{roleName},</if>
112 <if test="roleKey != null and roleKey != ''">#{roleKey},</if> 112 <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
113 - <if test="roleSort != null and roleSort != ''">#{roleSort},</if> 113 + <if test="roleSort != null">#{roleSort},</if>
114 <if test="dataScope != null and dataScope != ''">#{dataScope},</if> 114 <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
115 <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if> 115 <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
116 <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if> 116 <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
126 <set> 126 <set>
127 <if test="roleName != null and roleName != ''">role_name = #{roleName},</if> 127 <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
128 <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if> 128 <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
129 - <if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if> 129 + <if test="roleSort != null">role_sort = #{roleSort},</if>
130 <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if> 130 <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
131 <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if> 131 <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
132 <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if> 132 <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>