From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java
index f6f4d10..cfbdb77 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TInspectionReportDTO;
import com.ruoyi.system.mapper.SysUserMapper;
@@ -147,8 +148,13 @@
@PostMapping(value = "/api/t-inspection-report/update")
public R<Boolean> update(@RequestBody String param) {
TInspectionReportDTO dto = JSON.parseObject(param,TInspectionReportDTO.class);
+
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ dto.setStatus(null);
+ }
+
inspectionReportService.updateById(dto);
- if(dto.getStatus() != -1){
+ if(dto.getStatus() != null && dto.getStatus() != -1){
// 通过当前用户查询项目组
Long userId = tokenService.getLoginUser().getUserId();
TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -180,9 +186,13 @@
BeanUtils.copyProperties(inspectionReport, inspectionReportVO);
// 查询实验调度
TExperimentDispatch experimentDispatch = experimentDispatchService.getById(inspectionReportVO.getDispatchId());
- // 查询项目课题
- TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
- experimentDispatch.setProjectName(projectProposal.getProjectName());
+
+ if (experimentDispatch != null) {
+ // 查询项目课题
+ TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ experimentDispatch.setProjectCode(projectProposal.getProjectCode());
+ }
// 查询实验调度人员
List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
.eq(TExperimentDispatchParticipants::getDispatchId, inspectionReportVO.getDispatchId()));
--
Gitblit v1.7.1