From 4945f57d15ee46a4bee9b5b7003b774bb168d096 Mon Sep 17 00:00:00 2001
From: mlzhang <1371582736@qq.com>
Date: Sat, 10 Sep 2022 22:41:18 +0800
Subject: [PATCH] :bug: issues #I5QLRL

---
 admin/src/views/article/column/edit.vue                   | 2 +-
 admin/src/views/article/lists/edit.vue                    | 2 +-
 admin/src/views/organization/department/edit.vue          | 2 +-
 admin/src/views/organization/post/edit.vue                | 2 +-
 .../mdd/admin/validate/system/SystemAuthAdminParam.java   | 8 ++++++--
 .../mdd/admin/validate/system/SystemAuthDeptParam.java    | 3 ++-
 .../mdd/admin/validate/system/SystemAuthPostParam.java    | 4 +++-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/article/column/edit.vue b/admin/src/views/article/column/edit.vue
index 72c97c03..5e9b9dd9 100644
--- a/admin/src/views/article/column/edit.vue
+++ b/admin/src/views/article/column/edit.vue
@@ -13,7 +13,7 @@
                 <el-form-item label="栏目名称" prop="name">
                     <el-input v-model="formData.name" placeholder="请输入栏目名称" />
                 </el-form-item>
-                <el-form-item label="排序" prop="sort">
+                <el-form-item label="排序" prop="sort" :min="0">
                     <div>
                         <el-input-number v-model="formData.sort" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
diff --git a/admin/src/views/article/lists/edit.vue b/admin/src/views/article/lists/edit.vue
index dfffd3a8..d4c9b680 100644
--- a/admin/src/views/article/lists/edit.vue
+++ b/admin/src/views/article/lists/edit.vue
@@ -57,7 +57,7 @@
                         </el-form-item>
                         <el-form-item label="排序" prop="sort">
                             <div>
-                                <el-input-number v-model="formData.sort" />
+                                <el-input-number v-model="formData.sort" :min="0"/>
                                 <div class="form-tips">默认为0， 数值越大越排前</div>
                             </div>
                         </el-form-item>
diff --git a/admin/src/views/organization/department/edit.vue b/admin/src/views/organization/department/edit.vue
index 92661d32..53112cd1 100644
--- a/admin/src/views/organization/department/edit.vue
+++ b/admin/src/views/organization/department/edit.vue
@@ -37,7 +37,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" />
+                        <el-input-number v-model="formData.sort" :min="0"/>
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/admin/src/views/organization/post/edit.vue b/admin/src/views/organization/post/edit.vue
index e1f2c583..160a03df 100644
--- a/admin/src/views/organization/post/edit.vue
+++ b/admin/src/views/organization/post/edit.vue
@@ -18,7 +18,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" />
+                        <el-input-number v-model="formData.sort" :min="0"/>
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java
index 31322f82..d371272b 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java
@@ -2,12 +2,15 @@ package com.mdd.admin.validate.system;
 
 import com.mdd.common.validator.annotation.IDMust;
 import com.mdd.common.validator.annotation.IntegerContains;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
-import lombok.Data;
-import javax.validation.constraints.*;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -56,6 +59,7 @@ public class SystemAuthAdminParam implements Serializable {
     @IntegerContains(values = {0, 1}, message = "isMultipoint参数不在合法值内", groups = {create.class, update.class})
     private Integer isMultipoint;
 
+    @NotNull(message = "排序号不能为空", groups = {SystemAuthRoleParam.create.class, SystemAuthRoleParam.update.class})
     @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class})
     private Integer sort = 0;
 
diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java
index f25f6b88..184375a1 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java
@@ -44,6 +44,7 @@ public class SystemAuthDeptParam {
     @NotNull(message = "请选择状态", groups = {create.class, update.class})
     @IntegerContains(values = {0, 1}, groups = {create.class, update.class})
     private Integer isStop = 0;
-
+    @NotNull(message = "排序号不能为空", groups = {SystemAuthRoleParam.create.class, SystemAuthRoleParam.update.class})
+    @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {SystemAuthAdminParam.create.class, SystemAuthAdminParam.update.class})
     private Integer sort = 0;
 }
diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java
index ad45ff14..bb5996a3 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -38,7 +39,8 @@ public class SystemAuthPostParam {
 
     @Length( max = 250, message = "岗位备注不能大于250个字符内", groups = {create.class, update.class})
     private String remarks = "";
-
+    @NotNull(message = "排序号不能为空", groups = {SystemAuthRoleParam.create.class, SystemAuthRoleParam.update.class})
+    @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {SystemAuthAdminParam.create.class, SystemAuthAdminParam.update.class})
     private Integer sort = 0;
 
 }