From 9611f236b9e9073589b7844fa8e26a776a0811dd Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 5 Aug 2025 13:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/clz/mapper/MaterialMachineMapper.java  | 2 +-
 .../material/clz/service/impl/MaterialMachineServiceImpl.java | 4 ++--
 .../java/com/bonus/material/task/mapper/TmTaskMapper.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java
index 24fd5fad..e0cd668e 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialMachineMapper.java
@@ -98,7 +98,7 @@ public interface MaterialMachineMapper {
      * @param machine1
      * @return
      */
-    MaterialSltAgreementInfo selectStatusById(Machine machine1);
+    List<MaterialSltAgreementInfo> selectStatusById(Machine machine1);
 
     /**
      * 获取设备状态
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
index 8f8f5770..05fa797c 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
@@ -111,8 +111,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
             // 根据maId去协议表查询设备设备状态，赋值maStatus
             for (Machine machine1 : mergedList) {
                 if (machine1.getMaId() != null) {
-                    MaterialSltAgreementInfo sltAgreementInfo = materialMachineMapper.selectStatusById(machine1);
-                    if (sltAgreementInfo != null) {
+                    List<MaterialSltAgreementInfo> sltAgreementInfo = materialMachineMapper.selectStatusById(machine1);
+                    if (CollectionUtils.isNotEmpty(sltAgreementInfo)) {
                         machine1.setMaStatus("在用");
                     } else {
                         machine1.setMaStatus("在库");
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
index 1416665d..d0c3f738 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
@@ -129,7 +129,7 @@ public interface TmTaskMapper {
      * @param parseLong
      * @return
      */
-    TmTask selectTmTaskByPreTaskId(long parseLong);
+    TmTask selectTmTaskByPreTaskId(Long parseLong);
 
     /**
      * 查询单位信息