RuoYi
2022-01-18 79b1717f9a58796c06fc214914c5f6a1677cf9ee
vue3下点击编辑,取消修改报错问题
2 files modified
11 ■■■■ changed files
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java 9 ●●●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
@@ -129,7 +129,7 @@
        }
        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 }))
        {
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/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;
@@ -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;
    }