lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-05-31 14:12:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
TinyAnts
2022-09-14 14:48:27 +08:00
parent 978580a005 66b1158d6e
commit 266ba03e30
9 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java
View File

@@ -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<SystemAuthPost> iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
Page<SystemAuthPost> objectPage = new Page<>(page, limit);
objectPage.addOrder(OrderItem.asc("sort"));
IPage<SystemAuthPost> iPage = systemAuthPostMapper.selectPage(objectPage, queryWrapper);
List<SystemAuthPostVo> list = new ArrayList<>();
for (SystemAuthPost systemAuthPost : iPage.getRecords()) {

8
server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java
View File

@@ -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;
/**
@@ -55,6 +58,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;

3
server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java
View File

@@ -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;
}

4
server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java
View File

@@ -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;
}