fix -- 同步 RuoYi-Vue-Plus

This commit is contained in:
konbai
2022-03-19 14:42:58 +08:00
parent 56a81b7704
commit 9dc4a87709
24 changed files with 198 additions and 193 deletions

View File

@@ -14,6 +14,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@@ -60,8 +61,8 @@ public class SysPost extends BaseEntity {
*/
@ApiModelProperty(value = "岗位排序")
@ExcelProperty(value = "岗位排序")
@NotBlank(message = "显示顺序不能为空")
private String postSort;
@NotNull(message = "显示顺序不能为空")
private Integer postSort;
/**
* 状态0正常 1停用

View File

@@ -85,7 +85,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
@Override
public List<Long> selectDeptListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId);
return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly() == 1);
}
/**

View File

@@ -123,7 +123,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
@Override
public List<Long> selectMenuListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId);
return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly() == 1);
}
/**