BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

pull/1121/head
梁宇奇 2025-07-03 21:22:49 +08:00
parent a5eda65947
commit 69c3ba3784
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java
View File

@ -51,6 +51,9 @@ public class RoleInfoEditVO {
@ApiModelProperty("档口ID") @ApiModelProperty("档口ID")
private Long storeId; private Long storeId;
@ApiModelProperty("菜单状态（0正常 1停用）")
private String status;
/** /**
* 菜单集 * 菜单集
*/ */

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -166,7 +166,9 @@ public class SysMenuServiceImpl implements ISysMenuService {
if (menu.getOrderNum() == null) { if (menu.getOrderNum() == null) {
menu.setOrderNum(1); 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.setDelFlag(Constants.UNDELETED);
menu.setVersion(0L); menu.setVersion(0L);
String currentUser = SecurityUtils.getUsernameSafe(); String currentUser = SecurityUtils.getUsernameSafe();

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -240,7 +240,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
if (role.getRoleSort() == null) { if (role.getRoleSort() == null) {
role.setRoleSort(1); 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.setDelFlag(Constants.UNDELETED);
role.setVersion(0L); role.setVersion(0L);
String currentUser = SecurityUtils.getUsernameSafe(); String currentUser = SecurityUtils.getUsernameSafe();

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -435,7 +435,9 @@ public class SysUserServiceImpl implements ISysUserService {
private void insertUserBase(SysUser user) { private void insertUserBase(SysUser user) {
checkUserBase(user); checkUserBase(user);
Assert.isNull(user.getUserId()); 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.setDelFlag(Constants.UNDELETED);
user.setVersion(0L); user.setVersion(0L);
String currentUser = SecurityUtils.getUsernameSafe(); String currentUser = SecurityUtils.getUsernameSafe();