diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java index b94fd8a3..bc0e7fc5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java @@ -80,4 +80,14 @@ public class SysDept extends TenantEntity { */ private String ancestors; + /** + * 是否隐藏(0隐藏 1显示) + */ + private String isShow; + + /** + * 是否子集(0否 1是) + */ + private String isSubset; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 5f64d6f3..afe1c7df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -1,12 +1,10 @@ package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysDept; @@ -73,4 +71,94 @@ public class SysDeptBo extends BaseEntity { */ private String status; + /** + * 是否隐藏(0隐藏 1显示) + */ + @Pattern(regexp = "^[01]$", message = "isShow字段值必须是0或1") + private String isShow; + + /** + * 是否子集(0否 1是) + */ + @Pattern(regexp = "^[01]$", message = "isSubset字段值必须是0或1") + private String isSubset; + + +// /** +// * ====================== +// * 如果子集为0,则需要新增角色 +// * ====================== +// */ +// +// +// /** +// * 角色ID +// */ +// private Long roleId; +// +// /** +// * 角色名称 +// */ +// @NotBlank(message = "角色名称不能为空") +// @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符") +// private String roleName; +// +// /** +// * 角色权限字符串 +// */ +// @NotBlank(message = "角色权限字符串不能为空") +// @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符") +// private String roleKey; +// +// /** +// * 显示顺序 +// */ +// @NotNull(message = "显示顺序不能为空") +// private Integer roleSort; +// +// /** +// * 数据范围(1:全部数据权限 2:自定数据权限 3:本部门数据权限 4:本部门及以下数据权限) +// */ +// private String dataScope; +// +// /** +// * 菜单树选择项是否关联显示 +// */ +// private Boolean menuCheckStrictly; +// +// /** +// * 部门树选择项是否关联显示 +// */ +// private Boolean deptCheckStrictly; +// +// /** +// * 角色状态(0正常 1停用) +// */ +// private String roleStatus; +// +// /** +// * 备注 +// */ +// private String remark; +// +// /** +// * 菜单组 +// */ +// private Long[] menuIds; +// +// /** +// * 部门组(数据权限) +// */ +// private Long[] deptIds; +// +//// public SysDeptBo(Long roleId) { +//// this.roleId = roleId; +//// } +// +// public boolean isSuperAdmin() { +// return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId); +// } + + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 4606beb1..76e40415 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -83,6 +83,9 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName()); lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getIsShow()), SysDept::getIsShow, bo.getIsShow()); + lqw.eq(StringUtils.isNotBlank(bo.getIsSubset()), SysDept::getIsSubset, bo.getIsSubset()); lqw.orderByAsc(SysDept::getAncestors); lqw.orderByAsc(SysDept::getParentId); lqw.orderByAsc(SysDept::getOrderNum);