考勤

notes-pas/src/main/java/com/zjty/tynotes/pas/controller/RoleController.java

@@ -68,7 +68,7 @@ public class RoleController {
                 return "修改角色成功";
             }
         } catch (Exception e) {
-
+            return "修改角色失败";
         }
         return "修改角色失败";
     }

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/RoleServiceImpl.java

@@ -131,11 +131,11 @@ public class RoleServiceImpl implements IRoleService {
             role1.setName(role.getName());
             role1.setDescription(role.getDescription());
             roleDao.save(role1);
-            roleAuthorityDao.deleteAllByRoleId(role.getId());
+            roleAuthorityDao.deleteAllByRoleId(role1.getId());
             List<RoleAuthority> roleAuthorities = new ArrayList<>();
             for (Authority authority : role.getAuthorities()) {
                 RoleAuthority roleAuthority = new RoleAuthority();
-                roleAuthority.setRoleId(role.getId());
+                roleAuthority.setRoleId(role1.getId());
                 roleAuthority.setAuthorityId(authority.getId());
                 roleAuthorities.add(roleAuthority);
             }