客户反馈的bug修改

无关风月

2026-03-02 8dba8d30f6c0791f17d2ff057b06c5204f3a1f29

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

@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.domain.server.Sys;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.ChoiceDTO;
import com.ruoyi.system.dto.SysUserDTO;
import com.ruoyi.system.dto.TProjectTeamDTO;
@@ -31,6 +32,7 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -50,6 +52,8 @@
    private TProjectTeamStaffService projectTeamStaffService;
    @Resource
    private ISysUserService sysUserService;
    @Resource
    private TokenService tokenService;
    /**
     * 获取项目组管理列表
     */
@@ -60,6 +64,22 @@
        TProjectTeamQuery query = JSON.parseObject(param, TProjectTeamQuery.class);
        return R.ok(projectTeamService.pageList(query));
    }
    @ApiOperation(value = "新增报告-获取项目组分页列表")
    @PostMapping(value = "/api/t_project_team/pageList1")
    public R<PageInfo<TProjectTeamVO>> pageList1(@RequestBody String param) {
        TProjectTeamQuery query = JSON.parseObject(param, TProjectTeamQuery.class);
        Long userId = tokenService.getLoginUser().getUserId();
        SysUser sysUser = sysUserService.selectUserById(userId);
        if (!sysUser.getRoleType().equals("1")){
            List<String> projetIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, userId).list()
                    .stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
            if (projetIds.isEmpty()){
                return R.ok(new PageInfo<>());
            }
            query.setProjectIds(projetIds);
        }
        return R.ok(projectTeamService.pageList1(query));
    }

    /**
     * 添加项目组管理