修复了已知BUG

wenminjie

2026-07-13 0220811fbcffd4bd4df334502a2af272ae29f1e3

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

@@ -11,6 +11,7 @@
import com.ruoyi.common.enums.FeasibilityReportFileEnum;
import com.ruoyi.common.enums.FeasibilityStudyReportStatusEnum;
import com.ruoyi.common.enums.StudyReportTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TFeasibilityStudyReportDTO;
@@ -245,6 +246,11 @@
    @PostMapping(value = "/api/t-feasibility-study-report/update")
    public R<Boolean> update(@RequestBody String param) {
        TFeasibilityStudyReportDTO dto = JSON.parseObject(param,TFeasibilityStudyReportDTO.class);

        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())){
            dto.setStatus(null);
        }

        feasibilityStudyReportService.updateById(dto);
        feasibilityReportFileService.remove(Wrappers.lambdaQuery(TFeasibilityReportFile.class)
                .eq(TFeasibilityReportFile::getReportId, dto.getId()));
@@ -278,9 +284,11 @@
        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getUserId, userId)
                .last("LIMIT 1"));

        if (projectTeamStaff != null) {
        // 查询项目组
        TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
        if(dto.getStatus() != -1){
            if(dto.getStatus() != null && dto.getStatus() != -1){
            // MESSAGE 添加消息
            TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                    .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
@@ -307,6 +315,7 @@
                }
            }
        }
        }
        return R.ok();
    }

@@ -326,6 +335,7 @@
        feasibilityStudyReportVO.setFeasibilityReportFiles(feasibilityReportFiles);
        // 查询项目组
        TProjectTeam projectTeam = projectTeamService.getById(feasibilityStudyReport.getTeamId());
        if (projectTeam != null) {
        // 查询项目组成员
        List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId()));
@@ -333,6 +343,7 @@
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
        feasibilityStudyReportVO.setStaffNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
        feasibilityStudyReportVO.setProjectTeam(projectTeam);
        }
        SysUser sysUser = sysUserService.selectUserById(feasibilityStudyReport.getAuditPersonId());
        if(Objects.nonNull(sysUser)){
            feasibilityStudyReportVO.setAuditPersonName(sysUser.getNickName());