xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-19 03:46:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !34 from sunl19ht/issues-I9RU4S

Browse Source
This commit is contained in:
sunl19ht 2024-08-14 15:09:37 +00:00 committed by Gitee
commit a183cca588
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
View File

@ -60,7 +60,15 @@ public class EmployeeManager extends ServiceImpl<EmployeeDao, EmployeeEntity> {
// 保存员工 获得id
employeeDao.updateById(employee);
if (CollectionUtils.isNotEmpty(roleIdList)) {
/**
* ISSUES:I9RU4S (对员工赋角色后，不能取消员工的角色，只能修改员工角色)
* https://gitee.com/lab1024/smart-admin/issues/I9RU4S
* 问题：如果员工的角色仅剩一个，则不能删除
* 解决：如果roleIdList为空，则删除该员工所有角色
*/
if (CollectionUtils.isEmpty(roleIdList)) {
this.updateEmployeeRole(employee.getEmployeeId(), null);
} else if(CollectionUtils.isNotEmpty(roleIdList)) {
List<RoleEmployeeEntity> roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList());
this.updateEmployeeRole(employee.getEmployeeId(), roleEmployeeList);
}