Merge remote-tracking branch 'origin/uat' into uat

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -1234,7 +1234,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         sysUserService.deleteByLoginName(user.getLoginName());
                         SysUserRole role=new SysUserRole();
                         role.setUserId(sysUser.getUserId());
-                        role.setRoleId(user.getRoles().get(0).getRoleId());
+                        role.setRoleId(user.getRoleIds()[0]);
                         userRoleMapper.deleteUserRoleInfo(role);
                         user.setUserId(sysUser.getUserId());
                         insertUserRole(user);