ソースを参照

vue3下点击编辑,取消修改报错问题

RuoYi 4 年 前
コミット
79b1717f9a

+ 1 - 1
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -129,7 +129,7 @@ public class SysJobController extends BaseController
129
         }
129
         }
130
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
130
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
131
         {
131
         {
132
-            return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap'调用");
132
+            return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap(s)'调用");
133
         }
133
         }
134
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
134
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
135
         {
135
         {

+ 5 - 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
3
 import java.util.ArrayList;
3
 import java.util.ArrayList;
4
 import java.util.List;
4
 import java.util.List;
5
 import javax.validation.constraints.NotBlank;
5
 import javax.validation.constraints.NotBlank;
6
+import javax.validation.constraints.NotNull;
6
 import javax.validation.constraints.Size;
7
 import javax.validation.constraints.Size;
7
 import org.apache.commons.lang3.builder.ToStringBuilder;
8
 import org.apache.commons.lang3.builder.ToStringBuilder;
8
 import org.apache.commons.lang3.builder.ToStringStyle;
9
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,7 +31,7 @@ public class SysMenu extends BaseEntity
30
     private Long parentId;
31
     private Long parentId;
31
 
32
 
32
     /** 显示顺序 */
33
     /** 显示顺序 */
33
-    private String orderNum;
34
+    private Integer orderNum;
34
 
35
 
35
     /** 路由地址 */
36
     /** 路由地址 */
36
     private String path;
37
     private String path;
@@ -107,13 +108,13 @@ public class SysMenu extends BaseEntity
107
         this.parentId = parentId;
108
         this.parentId = parentId;
108
     }
109
     }
109
 
110
 
110
-    @NotBlank(message = "显示顺序不能为空")
111
-    public String getOrderNum()
111
+    @NotNull(message = "显示顺序不能为空")
112
+    public Integer getOrderNum()
112
     {
113
     {
113
         return orderNum;
114
         return orderNum;
114
     }
115
     }
115
 
116
 
116
-    public void setOrderNum(String orderNum)
117
+    public void setOrderNum(Integer orderNum)
117
     {
118
     {
118
         this.orderNum = orderNum;
119
         this.orderNum = orderNum;
119
     }
120
     }