diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java index 169329bc..4476089c 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java @@ -64,13 +64,11 @@ public class EmployeeManager extends ServiceImpl { * ISSUES:I9RU4S (对员工赋角色后,不能取消员工的角色,只能修改员工角色) * https://gitee.com/lab1024/smart-admin/issues/I9RU4S * 问题:如果员工的角色仅剩一个,则不能删除 - * 解决:如果roleIdList.size() == 0 即 roleIdList.isEmpty() 则删除当前员工下的所有角色 + * 解决:如果roleIdList为空,则删除该员工所有角色 */ - if (roleIdList.isEmpty()) { + if (CollectionUtils.isEmpty(roleIdList)) { this.updateEmployeeRole(employee.getEmployeeId(), null); - } - - if (CollectionUtils.isNotEmpty(roleIdList)) { + } else if(CollectionUtils.isNotEmpty(roleIdList)) { List roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList()); this.updateEmployeeRole(employee.getEmployeeId(), roleEmployeeList); }