合并分支 'gwj' 到 'master'

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

@@ -130,12 +130,12 @@ public class RoleServiceImpl implements IRoleService {
             Role role1 = byId.get();
             role1.setName(role.getName());
             role1.setDescription(role.getDescription());
-
-            roleAuthorityDao.deleteAllByRoleId(role.getId());
+            roleDao.save(role1);
+            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);
             }

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

@@ -562,6 +562,7 @@ public class UserServiceImpl implements IUserService {
         if(optional.isPresent()){
             User user = optional.get();
             user.setPassword(bCryptPasswordEncoder.encode("qwer1234"));
+            pasUserDao.save(user);
             return true;
         }
         return false;