Browse Source

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

RuoYi 3 years ago
parent
commit
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
         }
         }
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
         {
         {
-            return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap'调用");
+            return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap(s)'调用");
         }
         }
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
         else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
         {
         {

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,7 +31,7 @@ public class SysMenu extends BaseEntity
     private Long parentId;
     private Long parentId;
 
 
     /** 显示顺序 */
     /** 显示顺序 */
-    private String orderNum;
+    private Integer orderNum;
 
 
     /** 路由地址 */
     /** 路由地址 */
     private String path;
     private String path;
@@ -107,13 +108,13 @@ public class SysMenu extends BaseEntity
         this.parentId = parentId;
         this.parentId = parentId;
     }
     }
 
 
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getOrderNum()
     {
     {
         return orderNum;
         return orderNum;
     }
     }
 
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(Integer orderNum)
     {
     {
         this.orderNum = orderNum;
         this.orderNum = orderNum;
     }
     }