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

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -148,7 +148,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
      * @return
      */
     private MaintenanceCompany auditHandle(MtCompanyAttestation mtCompanyAttestation, CompanyAttestationRequest companyAttestationRequest, int auditResult) {
-        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyAttestationRequest.getMtCompanyId());
+        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyAttestation.getMtCompanyId());
         //设置认证时间
         mtCompanyAttestation.setDealTime(LocalDateTime.now());
         //设置认证理由

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

@@ -23,70 +23,81 @@ public class RoleController {
     private IRoleService roleService;
 
     /**
-     * @description 获取角色列表
-     * @date 2019/11/27 10:03 AM
      * @param roleRequest 角色请求类
      * @return
+     * @description 获取角色列表
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(RoleRequest roleRequest){
+    public RestResponse list(RoleRequest roleRequest) {
         return roleService.list(roleRequest);
     }
 
     /**
-     * @description 添加角色
-     * @date 2019/11/27 10:03 AM
+     * @param
+     * @return
+     * @description 获取用户公司角色列表
+     * @date 2019-12-23 22:54
+     */
+    @RequestMapping("/companyRoleList")
+    public RestResponse companyRoleList(RoleRequest roleRequest) {
+        return roleService.companyRoleList(roleRequest);
+    }
+
+    /**
      * @param roleRequest 角色请求对象
      * @return
+     * @description 添加角色
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/add")
-    public RestResponse addRole(@RequestBody RoleRequest roleRequest){
+    public RestResponse addRole(@RequestBody RoleRequest roleRequest) {
         //设置创建者信息
         return roleService.addRole(roleRequest);
     }
 
     /**
-     * @description 获取角色信息
-     * @date 2019-12-20 15:58
      * @param
      * @return
+     * @description 获取角色信息
+     * @date 2019-12-20 15:58
      */
     @RequestMapping("/info")
-    public RestResponse roleInfo(@RequestBody RoleRequest roleRequest){
+    public RestResponse roleInfo(@RequestBody RoleRequest roleRequest) {
         return roleService.info(roleRequest);
     }
 
     /**
-     * @description 添加角色
-     * @date 2019/11/27 10:03 AM
      * @param roleRequest 角色请求对象
      * @return
+     * @description 添加角色
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/update")
-    public RestResponse updateRole(@RequestBody RoleRequest roleRequest){
+    public RestResponse updateRole(@RequestBody RoleRequest roleRequest) {
         //设置更新者信息
         return roleService.updateRole(roleRequest);
     }
 
     /**
-     * @description 删除角色信息
-     * @date 2019/11/27 10:03 AM
      * @param roleRequest 角色请求类
      * @return
+     * @description 删除角色信息
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/delete")
-    public RestResponse deleteRole(@RequestBody RoleRequest roleRequest){
+    public RestResponse deleteRole(@RequestBody RoleRequest roleRequest) {
         return roleService.deleteRole(roleRequest);
     }
 
     /**
-     * @description 通过用户id获取用户对应的菜单信息
-     * @date 2019/11/27 10:03 AM
      * @param userRole 用户id和公司id
      * @return
+     * @description 通过用户id获取用户对应的菜单信息
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/getUserMenus")
-    public RestResponse getUserMenus(UserRole userRole){
+    public RestResponse getUserMenus(UserRole userRole) {
         return roleService.getUserMenus(userRole);
     }
 

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

@@ -87,4 +87,12 @@ public interface IRoleService extends IService<Role> {
      * @return
      */
     RestResponse info(RoleRequest roleRequest);
+
+    /**
+     * @param
+     * @return
+     * @description 获取公司角色列表
+     * @date 2019-12-23 22:55
+     */
+    RestResponse companyRoleList(RoleRequest roleRequest);
 }

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

@@ -123,15 +123,16 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
 
     @Override
     public RestResponse kickOutTeam(MtCompanyUserRequest mtCompanyUserRequest) {
+        MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
         //判断用户是否可以踢出团队
-        ProjectUser projectUser = new ProjectUser(mtCompanyUserRequest.getUserId(), mtCompanyUserRequest.getCompanyId());
+        ProjectUser projectUser = new ProjectUser(mtCompanyUser.getUserId(), mtCompanyUser.getMtCompanyId());
         Map<String, String> judgeMsg = projectService.judgeKickOutTeam(projectUser);
         //获取判断返回的状态码
         String code = judgeMsg.get(CommonConstants.RETURN_CODE_FIELD);
         if (ApiConstants.RESULT_ERROR.equals(code)) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, judgeMsg.get(CommonConstants.RETURN_MSG_FIELD));
         }
-        MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
+        //设置用户为踢出团队状态
         mtCompanyUser.setStatus(ApiConstants.ApplicationConstants.COMPANY_USER_FAIL);
         this.updateById(mtCompanyUser);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "踢出用户成功");
@@ -151,6 +152,8 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
                 //判断用户是否在符合查询条件的用户列表中
                 .in(userQueryIdList != null && userQueryIdList.size() > 0, "userId", userQueryIdList)
                 .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
+                //获取在团队中的用户
+                .eq("status", ApiConstants.ApplicationConstants.COMPANY_USER_PASS)
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
         List<MtCompanyUser> mtCompanyUserList = mtCompanyUserPage.getRecords();

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

@@ -201,4 +201,11 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         }
         return RestResponse.success(roleResponse, ApiConstants.RESULT_SUCCESS, "获取角色信息成功");
     }
+
+    @Override
+    public RestResponse companyRoleList(RoleRequest roleRequest) {
+        List<Role> roleList = this.list(new QueryWrapper<Role>()
+        .eq("company_id", roleRequest.getCompanyId()));
+        return RestResponse.success(roleList, ApiConstants.RESULT_SUCCESS, "获取角色信息成功");
+    }
 }