用户申请信息中设置角色信息

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

@@ -21,4 +21,5 @@ public class UserApplyResponse {
     private Integer powerType;//申请权限
     private LocalDateTime applyDate;//申请日期
     private LocalDateTime dealDate;//处理日期
+    private String roleName;//角色名称
 }

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

@@ -11,10 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IUserRoleService extends IService<UserRole> {
 
     /**
-     * @description 通过用户id和公司id获取用户角色关联信息
-     * @date 2019/11/27 10:03 AM
      * @param userRole 关联对象
      * @return
+     * @description 通过用户id和公司id获取用户角色关联信息
+     * @date 2019/11/27 10:03 AM
      */
     UserRole getByUserRole(UserRole userRole);
 }

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

@@ -10,10 +10,7 @@ import cn.com.ty.lift.common.utils.SendMessageUtil;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
-import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
-import cn.com.ty.lift.system.user.dao.entity.UserApplication;
-import cn.com.ty.lift.system.user.dao.entity.UserInfo;
-import cn.com.ty.lift.system.user.dao.entity.UserRole;
+import cn.com.ty.lift.system.user.dao.entity.*;
 import cn.com.ty.lift.system.user.dao.entity.model.*;
 import cn.com.ty.lift.system.user.dao.mapper.UserApplicationMapper;
 import cn.com.ty.lift.system.user.service.*;
@@ -54,6 +51,9 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
     @Resource
     private IUserRoleService userRoleService;
 
+    @Resource
+    private IRoleService roleService;
+
     @Resource
     private IUserService userService;
 
@@ -142,7 +142,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
 
     @Override
     public RestResponse applyList(UserApplyRequest userApplyRequest) {
-
+        Long companyId = userApplyRequest.getCompanyId();
         List<Long> userQueryIdList = null;
         //通过用户名或手机号查找用户id
         if (StringUtils.isNotBlank(userApplyRequest.getQueryCondition())) {
@@ -151,7 +151,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //获取所有状态的申请信息集合
         List<UserApplication> userApplicationListResult = this.list(new QueryWrapper<UserApplication>()
                 .select("status")
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
         );
         //封装不同状态的条数信息
         ApplyPageResponse applyPageResponse = new ApplyPageResponse();
@@ -162,13 +162,15 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         IPage userApplicationPage = new Page(userApplyRequest.getPageNum(), userApplyRequest.getPageSize());
         userApplicationPage = this.page(userApplicationPage, new QueryWrapper<UserApplication>()
                 .in(userQueryIdList != null && userQueryIdList.size() > 0, "user_id", userQueryIdList)
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
                 .eq("status", userApplyRequest.getStatus())
         );
         List<UserApplication> userApplicationList = userApplicationPage.getRecords();
         if (userApplicationList != null && userApplicationList.size() > 0) {
             //获取用id集合
             List<Long> userIdList = ProjectUtils.getAttrList(userApplicationList, "userId", null);
+            //获取用户id -> 角色关系
+            Map<Long, Role> userIdToRole = roleService.getUserIdToRoleByUserIdsAndCompanyId(userIdList, companyId);
             //用户id对应的用户基本信息
             Map<Long, UserResponse> userIdToUserResponse = userService.getUserResponseByUserIdList(userIdList);
             for (UserApplication userApplication : userApplicationList) {
@@ -179,7 +181,13 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
                     userApplyResponse.setUserAvatarUrl(userResponse.getAvatarUrl());
                     userApplyResponse.setUserName(userResponse.getName());
                     userApplyResponse.setUserMobile(userResponse.getMobile());
-                    userApplyResponse.setUserType(userResponse.getType());
+                }
+                //设置申请人角色信息
+                if (userIdToRole != null) {
+                    Role role = userIdToRole.get(userApplication.getUserId());
+                    if(role != null) {
+                        userApplyResponse.setRoleName(role.getName());
+                    }
                 }
                 //设置申请基础信息
                 userApplyResponse.setApplyDate(userApplication.getApplyDate());

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

@@ -1,12 +1,17 @@
 package cn.com.ty.lift.system.user.service.impl;
 
+import cn.com.ty.lift.system.user.dao.entity.Role;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
 import cn.com.ty.lift.system.user.dao.mapper.UserRoleMapper;
 import cn.com.ty.lift.system.user.service.IUserRoleService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.sql.Wrapper;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author huangyuan
@@ -24,4 +29,5 @@ public class UserRoleService extends ServiceImpl<UserRoleMapper, UserRole> imple
     public UserRole getByUserRole(UserRole userRole) {
         return userRoleMapper.getByUserRole(userRole);
     }
+
 }