bug修改

xuhy

4 天以前 a4786fae8fe760d5e88881cd1d258d50da1dff2f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TProjectTeamDTO;
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.model.TProjectTeam;
@@ -25,6 +26,8 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -42,11 +45,13 @@
    private final TProjectTeamService projectTeamService;
    private final TProjectTeamStaffService projectTeamStaffService;
    private final ISysUserService sysUserService;
    private final TokenService tokenService;
    @Autowired
    public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) {
    public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService) {
        this.projectTeamService = projectTeamService;
        this.projectTeamStaffService = projectTeamStaffService;
        this.sysUserService = sysUserService;
        this.tokenService = tokenService;
    }

    /**
@@ -196,5 +201,38 @@
        return R.ok();
    }

    /**
     * 查看项目组详情
     */
    @ApiOperation(value = "查询当前用户项目组信息")
    @GetMapping(value = "/open/t-project-team/getDetailByUserId")
    public R<TProjectTeamVO> getDetailByUserId() {
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getUserId, userId)
                .eq(TProjectTeamStaff::getRoleType, roleType)
                .last("LIMIT 1"));
        if(Objects.isNull(projectTeamStaff)){
            return R.fail("当前用户未分配项目组,无法查看项目组信息");
        }
        TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
        TProjectTeamVO projectTeamVO = new TProjectTeamVO();
        BeanUtils.copyProperties(projectTeam, projectTeamVO);
        // 查询项目组人员
        List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId()));
        // 查询所有人员
        List<SysUser> sysUsers = sysUserService.selectList();
        for (TProjectTeamStaff tProjectTeamStaff : list) {
            sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {
                tProjectTeamStaff.setNickName(sysUser.getNickName());
                tProjectTeamStaff.setAvatar(sysUser.getAvatar());
            });
        }
        projectTeamVO.setStaffs(list);
        projectTeamVO.setStaffName(list.stream().map(TProjectTeamStaff::getNickName).collect(Collectors.joining(",")));
        return R.ok(projectTeamVO);
    }

}