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/RoleService.java

@@ -184,13 +184,15 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
             Map<Long, UserRole> userIdToUserRole = ProjectUtils.attrToObjMap(userRoleList, "userId", null);
             //获取角色列表
             List<Long> roleIdList = ProjectUtils.getAttrList(userRoleList, "roleId", null);
-            List<Role> roleList = (List<Role>) this.listByIds(roleIdList);
-            Map<Long, Role> idToRole = ProjectUtils.attrToObjMap(roleList, "id", null);
-            for (Long userId : userIdList) {
-                UserRole userRole = userIdToUserRole.get(userId);
-                if (userRole != null) {
-                    Role role = idToRole.get(userRole.getRoleId());
-                    userIdToRole.put(userId, role);
+            if(roleIdList != null && roleIdList.size() > 0){
+                List<Role> roleList = (List<Role>) this.listByIds(roleIdList);
+                Map<Long, Role> idToRole = ProjectUtils.attrToObjMap(roleList, "id", null);
+                for (Long userId : userIdList) {
+                    UserRole userRole = userIdToUserRole.get(userId);
+                    if (userRole != null) {
+                        Role role = idToRole.get(userRole.getRoleId());
+                        userIdToRole.put(userId, role);
+                    }
                 }
             }
         }

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

@@ -179,16 +179,18 @@ public class UserService implements IUserService {
             maintenanceCompanyService.setCompanyUserNum(maintenanceCompanyList);
             userResponse.setCompanyList(maintenanceCompanyList);
             //用户进入后的默认团队信息
-            MaintenanceCompany maintenanceCompany = maintenanceCompanyList.get(0);
-            userResponse.setMaintenanceCompany(maintenanceCompany);
-            //获取用户在默认团队中的角色信息
-            Role role = roleService.getRoleByUserIdAndCompanyId(userId, maintenanceCompany.getId());
-            userResponse.setRole(role);
-            //获取用户在当前企业下的菜单
-            if (role != null) {
-                List<Menu> menus = menuService.getByRoleId(role.getId());
-                menus = menuService.getMenuTree(menus);
-                userResponse.setMenus(menus);
+            if(maintenanceCompanyList != null && maintenanceCompanyList.size() > 0){
+                MaintenanceCompany maintenanceCompany = maintenanceCompanyList.get(0);
+                userResponse.setMaintenanceCompany(maintenanceCompany);
+                //获取用户在默认团队中的角色信息
+                Role role = roleService.getRoleByUserIdAndCompanyId(userId, maintenanceCompany.getId());
+                userResponse.setRole(role);
+                //获取用户在当前企业下的菜单
+                if (role != null) {
+                    List<Menu> menus = menuService.getByRoleId(role.getId());
+                    menus = menuService.getMenuTree(menus);
+                    userResponse.setMenus(menus);
+                }
             }
         }
         return userResponse;