合并分支 'gwj' 到 'master'

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

@@ -412,7 +412,7 @@ public class UserServiceImpl implements IUserService {
         List<RoleAuthority> roleAuthoritieList = new ArrayList<>();
         List<Authority> authorities = authorityDao.findAllByNameIn(auname);
         List<RoleAuthority> roleAuthorities = roleAuthorityDao.findAllByRoleId(role.getId());
-        if(roleAuthorities==null&&roleAuthorities.size()==0){
+        if(roleAuthorities==null||roleAuthorities.size()==0){
             for (Authority authority : authorities) {
                 roleAuthoritieList.add(new RoleAuthority(null,role.getId(),authority.getId()));
             }