Browse Source

🎉 修复dict、role不选择父节点报错

test
smallchill 5 years ago
parent
commit
e0fb04208f
  1. 5
      blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
  2. 3
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java
  3. 5
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java

5
blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@ -81,6 +81,11 @@ public interface CommonConstant {
*/ */
String DEFAULT_PASSWORD = "123456"; String DEFAULT_PASSWORD = "123456";
/**
* 默认排序字段
*/
String SORT_FIELD = "sort";
/** /**
* 动态获取nacos地址 * 动态获取nacos地址
* *

3
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java

@ -73,6 +73,9 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
if (cnt > 0) { if (cnt > 0) {
throw new ApiException("当前字典键值已存在!"); throw new ApiException("当前字典键值已存在!");
} }
if (Func.isEmpty(dict.getParentId())) {
dict.setParentId(BladeConstant.TOP_PARENT_ID);
}
dict.setIsDeleted(BladeConstant.DB_NOT_DELETED); dict.setIsDeleted(BladeConstant.DB_NOT_DELETED);
return saveOrUpdate(dict); return saveOrUpdate(dict);
} }

5
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java

@ -133,12 +133,15 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
@Override @Override
public boolean submit(Role role) { public boolean submit(Role role) {
role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
if (!SecureUtil.isAdministrator()) { if (!SecureUtil.isAdministrator()) {
if (Func.toStr(role.getRoleAlias()).equals(RoleConstant.ADMINISTRATOR)) { if (Func.toStr(role.getRoleAlias()).equals(RoleConstant.ADMINISTRATOR)) {
throw new ServiceException("无权限创建超管角色!"); throw new ServiceException("无权限创建超管角色!");
} }
} }
if (Func.isEmpty(role.getParentId())) {
role.setParentId(BladeConstant.TOP_PARENT_ID);
}
role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
return saveOrUpdate(role); return saveOrUpdate(role);
} }

Loading…
Cancel
Save