diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index 61ee2db0..aa84590a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -61,6 +61,9 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl roleList = sysUserRoleService.getRole(currentUser.getUsername()); + if (roleList != null && roleList.contains(FieldCommon.ROLE_ADMIN)) { records.forEach(kv -> kv.put(FieldCommon.EDIT_FLAG, true)); return; } @@ -249,8 +254,10 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl roleList = sysUserRoleService.getRole(currentUser.getUsername()); + if (roleList != null && roleList.contains(FieldCommon.ROLE_ADMIN)) { return true; } // 创建人可以删除 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java index b28c9f32..65d9b5ea 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java @@ -60,7 +60,7 @@ public class EnterpriseStandardUtil { .sorted() .collect(Collectors.toList()); - int expectedNumber = 0; // 我们期望的最大序列号初始化为0 + int expectedNumber = 1; if (!sortedNumbers.isEmpty()) { expectedNumber = sortedNumbers.get(sortedNumbers.size() - 1) + 1; // 获取最大的数字并+1 }