From 3a0412f3a5dffb3fbd358698da9da4f091e1bbd3 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sun, 11 May 2025 22:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E7=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExperimentController.java      | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

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<Experiment, IExperimen
     @Autowired
     private SysDataSourceController              sysDataSourceController;
 
+
+    private static final String ADMIN_NAME = "admin";
+
     /**
      * 分页列表查询
      *
@@ -214,17 +217,24 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @RequiresPermissions("database:experiment:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> 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<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
         List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
         List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
@@ -248,8 +258,6 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         ExperimentLog experimentLog = new ExperimentLog();
         experimentLog.setExperimentId(experiment.getId());
         experimentLog.setLogContent("修改实验信息");
-        String username = JwtUtil.getUserNameByToken(request);
-        SysUser userByName = userService.getUserByName(username);
         experimentLog.setCreateBy(userByName.getRealname());
         experimentLogService.save(experimentLog);
         return Result.OK("编辑成功!");