diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java index 0c743f6..e8952f2 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -85,14 +86,16 @@ public class ExperimentReviewController extends JeecgController queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId, - @RequestParam(name = "sampleId", required = true) String sampleId) { + @RequestParam(name = "sampleId", required = false) String sampleId) { Experiment experiment = experimentService.getById(experimentId); if (null == experiment) { return Result.error("未找到试验数据"); } List experimentReviewList = experimentReviewService.getByExperimentId(experimentId); - ExperimentReview experimentReview = experimentReviewService.getBySampleId(experimentId, sampleId); - experiment.setExperimentReview(experimentReview); + if (StringUtils.isNotBlank(sampleId)) { + ExperimentReview experimentReview = experimentReviewService.getBySampleId(experimentId, sampleId); + experiment.setExperimentReview(experimentReview); + } experiment.setExperimentReviewList(experimentReviewList); return Result.OK(experiment);