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

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserResponse.java

@@ -29,4 +29,5 @@ public class UserResponse {
     private List<Menu> menus;//用户菜单
     private MaintenanceCompany maintenanceCompany;//用户当前团队信息
     private Role role;//用户角色
+    private String roleCode;//角色编码
 }

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

@@ -105,6 +105,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         );
         //获取角色关联的用户信息
         List<Long> userIdList = ProjectUtils.getAttrList(userRoleList, "userId", null);
+        Map<Long, Role> userIdToRole = roleService.getUserIdToRoleByUserIdsAndCompanyId(userIdList, mtCompanyUserRequest.getCompanyId());
         //获取用户信息集合
         if (userIdList != null && userIdList.size() > 0) {
             List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
@@ -115,6 +116,12 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
                     UserResponse userResponse = new UserResponse();
                     userResponse.setUserId(userId);
                     UserInfo userInfo = userIdToUserInfo.get(userId);
+                    //用户id->角色
+                    Role role = userIdToRole.get(userId);
+                    //设置角色编码
+                    if(role !=  null){
+                        userResponse.setRoleCode(role.getCode());
+                    }
                     if (userInfo != null) {
                         userResponse.setName(userInfo.getName());
                     }