diff --git a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java index f78813c5..4f1080cd 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java @@ -81,6 +81,11 @@ public interface CommonConstant { */ String DEFAULT_PASSWORD = "123456"; + /** + * 默认排序字段 + */ + String SORT_FIELD = "sort"; + /** * 动态获取nacos地址 * diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java index 5059c805..bba68648 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java @@ -73,6 +73,9 @@ public class DictServiceImpl extends ServiceImpl implements ID if (cnt > 0) { throw new ApiException("当前字典键值已存在!"); } + if (Func.isEmpty(dict.getParentId())) { + dict.setParentId(BladeConstant.TOP_PARENT_ID); + } dict.setIsDeleted(BladeConstant.DB_NOT_DELETED); return saveOrUpdate(dict); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index ba419dc9..97396344 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -133,12 +133,15 @@ public class RoleServiceImpl extends ServiceImpl implements IR @Override public boolean submit(Role role) { - role.setIsDeleted(BladeConstant.DB_NOT_DELETED); if (!SecureUtil.isAdministrator()) { if (Func.toStr(role.getRoleAlias()).equals(RoleConstant.ADMINISTRATOR)) { throw new ServiceException("无权限创建超管角色!"); } } + if (Func.isEmpty(role.getParentId())) { + role.setParentId(BladeConstant.TOP_PARENT_ID); + } + role.setIsDeleted(BladeConstant.DB_NOT_DELETED); return saveOrUpdate(role); }