diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java index 727f176fa..1b1f0da1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java @@ -51,6 +51,9 @@ public class RoleInfoEditVO { @ApiModelProperty("档口ID") private Long storeId; + @ApiModelProperty("菜单状态(0正常 1停用)") + private String status; + /** * 菜单集 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 7c1d80b68..88abb01c6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -166,7 +166,9 @@ public class SysMenuServiceImpl implements ISysMenuService { if (menu.getOrderNum() == null) { menu.setOrderNum(1); } - menu.setStatus(Constants.SYS_NORMAL_STATUS); + if (StrUtil.isBlank(menu.getStatus())) { + menu.setStatus(Constants.SYS_NORMAL_STATUS); + } menu.setDelFlag(Constants.UNDELETED); menu.setVersion(0L); String currentUser = SecurityUtils.getUsernameSafe(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 3a5136df8..926acb317 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -240,7 +240,9 @@ public class SysRoleServiceImpl implements ISysRoleService { if (role.getRoleSort() == null) { role.setRoleSort(1); } - role.setStatus(Constants.SYS_NORMAL_STATUS); + if (StrUtil.isBlank(role.getStatus())) { + role.setStatus(Constants.SYS_NORMAL_STATUS); + } role.setDelFlag(Constants.UNDELETED); role.setVersion(0L); String currentUser = SecurityUtils.getUsernameSafe(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index bef22f52d..dbafcfb46 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -435,7 +435,9 @@ public class SysUserServiceImpl implements ISysUserService { private void insertUserBase(SysUser user) { checkUserBase(user); Assert.isNull(user.getUserId()); - user.setStatus(Constants.SYS_NORMAL_STATUS); + if (StrUtil.isBlank(user.getStatus())) { + user.setStatus(Constants.SYS_NORMAL_STATUS); + } user.setDelFlag(Constants.UNDELETED); user.setVersion(0L); String currentUser = SecurityUtils.getUsernameSafe();