完善角色管理代码

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

@@ -22,10 +22,10 @@ public class MtCompanyUserController {
     private IMtCompanyUserService mtCompanyUserService;
 
     /**
-     * @description 获取当前企业用户列表
-     * @date 2019-12-23 14:11
      * @param
      * @return
+     * @description 获取当前企业用户列表
+     * @date 2019-12-23 14:11
      */
     @RequestMapping("/list")
     public RestResponse list(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
@@ -64,4 +64,15 @@ public class MtCompanyUserController {
     public RestResponse kickOutTeam(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
         return mtCompanyUserService.kickOutTeam(mtCompanyUserRequest);
     }
+
+    /**
+     * @param
+     * @return
+     * @description 设置急修信息
+     * @date 2019-12-26 17:58
+     */
+    @PostMapping("/setRepair")
+    public RestResponse setRepair(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
+        return mtCompanyUserService.setRepair(mtCompanyUserRequest);
+    }
 }

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

@@ -16,6 +16,7 @@ public class MtCompanyUserRequest {
     private Long roleId;//角色id
     private String roleCode;//角色编码
     private String job;//角色
+    private Integer repairFlag;//是否急修工
     private Long pageSize;//每页条数
     private Long pageNum;//页数
 }

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

@@ -4,6 +4,7 @@ import cn.com.ty.lift.system.user.dao.entity.Menu;
 import cn.com.ty.lift.system.user.dao.entity.Role;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,6 +18,7 @@ public class RoleResponse {
     private String name;//角色名称
     private String description;//描述
     private String createUserName;//创建人名称
+    private Date createDate;//创建时间
     private List<Menu> menuList;//角色所有的菜单列表
     private List<Menu> companyMenuList;//企业菜单列表
 
@@ -26,5 +28,6 @@ public class RoleResponse {
         this.id = role.getId();
         this.name = role.getName();
         this.description = role.getDescription();
+        this.createDate = role.getCreateTime();
     }
 }

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

@@ -42,4 +42,12 @@ public interface IMtCompanyUserService extends IService<MtCompanyUser> {
      * @return
      */
     RestResponse getCompanyUserList(MtCompanyUserRequest mtCompanyUserRequest);
+
+    /**
+     * @description 设置急修信息
+     * @date 2019-12-26 17:58
+     * @param
+     * @return
+     */
+    RestResponse setRepair(MtCompanyUserRequest mtCompanyUserRequest);
 }

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

@@ -90,7 +90,10 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
                 .eq("company_id", companyId)
         );
         List<Long> menuIdList = ProjectUtils.getAttrList(companyMenuList, "menuId", null);
-        return (List<Menu>) this.listByIds(menuIdList);
+        if(menuIdList !=  null && menuIdList.size() > 0){
+            return (List<Menu>) this.listByIds(menuIdList);
+        }
+        return null;
     }
 
     @Override

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

@@ -209,4 +209,12 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         return RestResponse.success(mtCompanyUserPage, ApiConstants.RESULT_SUCCESS, "获取公司成员列表成功");
     }
 
+    @Override
+    public RestResponse setRepair(MtCompanyUserRequest mtCompanyUserRequest) {
+        MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
+        mtCompanyUser.setRepairFlag(mtCompanyUserRequest.getRepairFlag());
+        this.updateById(mtCompanyUser);
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "设置急修信息成功");
+    }
+
 }

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

@@ -54,14 +54,16 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         if(roleList != null && roleList.size() > 0){
             List<RoleResponse> roleResponseList = new ArrayList<>();
             //获取创建者名称
-            List<Long> userIdList = ProjectUtils.getAttrList(roleList, "userId", null);
+            List<Long> userIdList = ProjectUtils.getAttrList(roleList, "createUserId", null);
             Map<Long, UserInfo> userIdToInfo = userInfoService.userIdToInfo(userIdList);
             for(Role role : roleList){
                 RoleResponse roleResponse = new RoleResponse(role);
                 //设置创建者名称
                 if(userIdToInfo != null){
                     UserInfo userInfo = userIdToInfo.get(role.getCreateUserId());
-                    roleResponse.setCreateUserName(userInfo.getName());
+                    if(userInfo != null){
+                        roleResponse.setCreateUserName(userInfo.getName());
+                    }
                 }
                 roleResponseList.add(roleResponse);
             }