默认为0, 数值越大越排前
diff --git a/admin/src/views/article/lists/edit.vue b/admin/src/views/article/lists/edit.vue
index dfffd3a8b6551f29918cb362628be5c0b7e27507..d4c9b680ea1375d59887d3d52703125b27a92649 100644
--- a/admin/src/views/article/lists/edit.vue
+++ b/admin/src/views/article/lists/edit.vue
@@ -57,7 +57,7 @@
diff --git a/admin/src/views/organization/department/edit.vue b/admin/src/views/organization/department/edit.vue
index 5deff7bea86fce3850d7cf407bed25e200bdb8e8..53112cd14379e7f84c49603cf90bfb8d91ebc98d 100644
--- a/admin/src/views/organization/department/edit.vue
+++ b/admin/src/views/organization/department/edit.vue
@@ -37,7 +37,7 @@
@@ -70,7 +70,19 @@ const formData = reactive({
sort: 0,
isStop: 0
})
-
+const checkMobile = (rule: any, value: any, callback: any) => {
+ if (!value) {
+ return callback(new Error('手机号不能为空'));
+ } else {
+ const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
+ console.log(reg.test(value));
+ if (reg.test(value)) {
+ callback();
+ } else {
+ return callback(new Error('请输入正确的手机号'));
+ }
+ }
+}
const formRules = {
pid: [
{
@@ -85,7 +97,25 @@ const formRules = {
message: '请输入部门名称',
trigger: ['blur']
}
- ]
+ ],
+ duty: [
+ {
+ required: true,
+ message: '请输入负责人姓名',
+ trigger: ['blur']
+ }
+ ],
+ mobile: [
+ {
+ required: true,
+ message: '请输入联系电话',
+ trigger: ['blur']
+ },
+ {
+ validator: checkMobile,
+ trigger: ['blur']
+ }
+ ]
}
const { optionsData } = useDictOptions<{
diff --git a/admin/src/views/organization/post/edit.vue b/admin/src/views/organization/post/edit.vue
index 70d08e665a230947ed39bc61e7e166d7e52f9e4f..160a03df6cb5a67da5db19a559b3302b627d8655 100644
--- a/admin/src/views/organization/post/edit.vue
+++ b/admin/src/views/organization/post/edit.vue
@@ -18,13 +18,13 @@
-
+
+
diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java
index 8dee15095dc9c0062cc5414ded233b5727f581aa..8dfcd7f37d9c87e68f8cc78e0d2668e1285d5428 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java
@@ -2,6 +2,7 @@ package com.mdd.admin.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mdd.admin.service.system.ISystemAuthPostService;
@@ -86,7 +87,9 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
"=:isStop@is_stop:int"
});
- IPage iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
+ Page objectPage = new Page<>(page, limit);
+ objectPage.addOrder(OrderItem.asc("sort"));
+ IPage iPage = systemAuthPostMapper.selectPage(objectPage, queryWrapper);
List list = new ArrayList<>();
for (SystemAuthPost systemAuthPost : iPage.getRecords()) {
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 31322f82cbaf8a6c85239ecfff49a416d7c51068..d371272b42a570130146e377cff40b8f26a77bcc 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 f25f6b8873cb7b3afd822605b2a83db3a7299dc0..184375a132cdf048acc10c4da714531553d32e3e 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 ad45ff14080c3f340bf18ef1bff3d0b5483e11bb..bb5996a3ebffb26223503acc4f99cd6eeeb45860 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;
}