Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MtCompanyUserService.java

@@ -82,7 +82,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         );
         if (userRole != null) {
             //获取用户的角色信息
-            Role role = roleService.getById(userRole.getId());
+            Role role = roleService.getById(userRole.getRoleId());
             if (role != null) {
                 //若角色为区域主管,判断角色是否有关联的信息
                 if (CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(role.getCode())) {