diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 1274c16..c1b9cd1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -82,6 +82,9 @@ public class ExperimentController extends JeecgController edit(@RequestBody Experiment experiment, HttpServletRequest request) { - Experiment dbExp = experimentService.getById(experiment.getId()); - if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExp.getStatus(), - ExperimentStatus.REVIEWED)) { - return Result.error("试验状态:[" + dbExp.getStatus() + "]不能进行修改!"); + + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + // 超级管理不用判断状态和修改状态,只修改数据。 20250511 邓春 + if (!ADMIN_NAME.equals(userByName)) { + Experiment dbExp = experimentService.getById(experiment.getId()); + if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExp.getStatus(), + ExperimentStatus.REVIEWED)) { + return Result.error("试验状态:[" + dbExp.getStatus() + "]不能进行修改!"); + } + if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)) { + experiment.setStatus(ExperimentStatus.PRE_TEST); + } else { + experiment.setStatus(dbExp.getStatus()); + } + experiment.setIndexNo(dbExp.getIndexNo()); } - if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)) { - experiment.setStatus(ExperimentStatus.PRE_TEST); - } else { - experiment.setStatus(dbExp.getStatus()); - } - experiment.setIndexNo(dbExp.getIndexNo()); + List sampleInfoList = experiment.getSampleInfoList(); List irradiationBoardList = experiment.getIrradiationBoardList(); List deviationConditionList = experiment.getDeviationConditionList(); @@ -248,8 +258,6 @@ public class ExperimentController extends JeecgController