From 3208f2b8a3c76f4c1659f41ab7eef49c58adc681 Mon Sep 17 00:00:00 2001
From: Timer <@>
Date: Thu, 26 Mar 2026 00:48:05 +0800
Subject: [PATCH] bug

---
 .../equipment/EquipmentCardController.java       |  8 ++++++++
 .../safety/SafetyCheckDaylyController.java       |  3 ++-
 .../service/equipment/EquipmentCardService.java  | 16 ++++++++++++++--
 .../com/sipai/service/scada/MPointService.java   |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java
index dad93502..2dfb753e 100644
--- a/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java
+++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java
@@ -5696,6 +5696,14 @@ public class EquipmentCardController {
      * @param model
      * @return
      */
+//    ├── Water Plant (水厂)
+//│   ├── Process Section A (工艺段)  ← Previously lost
+//│   ├── Process Section B (工艺段)  ← Previously lost
+//│   ├── Pump Station 1 (泵站)       ← Was overwriting above
+//│   │   ├── Process Section C (工艺段)
+//│   │   └── Process Section D (工艺段)
+//│   └── Pump Station 2 (泵站)
+//            │       └── Process Section E (工艺段)
     @RequestMapping("/getProcessSection4EquipmentCardTree.do")
     public String getProcessSection4EquipmentCardTree(HttpServletRequest request, Model model) {
         String unitId = request.getParameter("unitId");
diff --git a/src/main/java/com/sipai/controller/safety/SafetyCheckDaylyController.java b/src/main/java/com/sipai/controller/safety/SafetyCheckDaylyController.java
index 7b3b19e8..c44ac870 100644
--- a/src/main/java/com/sipai/controller/safety/SafetyCheckDaylyController.java
+++ b/src/main/java/com/sipai/controller/safety/SafetyCheckDaylyController.java
@@ -211,7 +211,8 @@ public class SafetyCheckDaylyController {
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public Result saveApply(HttpServletRequest request, SafetyCheckDayly bean, MultipartFile file) throws Exception {
-        if(StringUtils.isEmpty(bean.getDutyUserId())){
+        if(bean.getCheckResult() != 1 && StringUtils.isEmpty(bean.getDutyUserId())){
+            // 弱智东西，不相符的才需要整改负责人
             return Result.failed("整改负责人不能为空！");
         }
 
diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCardService.java b/src/main/java/com/sipai/service/equipment/EquipmentCardService.java
index f4cbaf4c..bbc802a8 100644
--- a/src/main/java/com/sipai/service/equipment/EquipmentCardService.java
+++ b/src/main/java/com/sipai/service/equipment/EquipmentCardService.java
@@ -8424,7 +8424,13 @@ public class EquipmentCardService implements CommService<EquipmentCard> {
                     }
                 }
                 if (childlist.size() > 0) {
-                    mp.put("nodes", childlist);
+                    // 保留已有的nodes（如工艺段），将子单元添加到现有nodes中
+                    List<Map<String, Object>> existingNodes = (List<Map<String, Object>>) mp.get("nodes");
+                    if (existingNodes != null && existingNodes.size() > 0) {
+                        existingNodes.addAll(childlist);
+                    } else {
+                        mp.put("nodes", childlist);
+                    }
                     getTreeList4ProcessSection(childlist, list);
                 }
             }
@@ -8491,7 +8497,13 @@ public class EquipmentCardService implements CommService<EquipmentCard> {
                     }
                 }
                 if (childlist.size() > 0) {
-                    mp.put("nodes", childlist);
+                    // 保留已有的nodes（如设备类型），将子单元添加到现有nodes中
+                    List<Map<String, Object>> existingNodes = (List<Map<String, Object>>) mp.get("nodes");
+                    if (existingNodes != null && existingNodes.size() > 0) {
+                        existingNodes.addAll(childlist);
+                    } else {
+                        mp.put("nodes", childlist);
+                    }
                     getTreeList4EquipmentClass(childlist, list);
                 }
             }
diff --git a/src/main/java/com/sipai/service/scada/MPointService.java b/src/main/java/com/sipai/service/scada/MPointService.java
index 5b28bfd3..6cabf4d3 100644
--- a/src/main/java/com/sipai/service/scada/MPointService.java
+++ b/src/main/java/com/sipai/service/scada/MPointService.java
@@ -1661,7 +1661,7 @@ public class MPointService {
                 for (int i = minCellNum; i < maxCellNum; i++) {
                     HSSFCell mpidCell = mpidRow.getCell(i);
                     String mpidStr = getStringVal(mpidCell);
-                    MPoint mPoint = this.selectByWhere(unitId, "where MPointCode like '%" + mpidStr + "%' or ParmName like '%" + mpidStr + "%' ");
+                    MPoint mPoint = this.selectByWhere(unitId, "where MPointCode = '"+ mpidStr+"'");
                     if (mPoint != null) {
                         String mpid = mPoint.getMpointcode();
                         MPointHistory mPointHistory = new MPointHistory();