From ee5eed0a5995b0488a415d94b6f3db0357516f45 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 18 Dec 2024 16:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/device/service/impl/DevInfoServiceImpl.java      | 4 ++++
 .../main/resources/mapper/material/device/DevInfoMapper.xml   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
index 5ba4195..0173642 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
@@ -761,12 +761,16 @@ public class DevInfoServiceImpl implements DevInfoService {
 
     @Override
     public List<DevInfoVo> getDevList(DevInfoVo devInfo) {
+        Integer rentNum = devInfo.getRentNum();
         List<DevInfoVo> devList = devInfoMapper.getDevList(devInfo);
         for (DevInfoVo devInfoVo : devList) {
             DevInfo devInfo1 = devInfoMapper.getDevStatus(devInfoVo);
             devInfoVo.setRentNum(devInfo1.getRentNum());
             devInfoVo.setMaStatus(devInfo1.getMaStatus());
         }
+        if (rentNum != null){
+            devList = devList.stream().filter(devInfoVo -> devInfoVo.getRentNum().equals(rentNum)).collect(Collectors.toList());
+        }
         return devList;
     }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index df3c4ec..bdb7d6d 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -849,6 +849,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId != null">
             AND d.type_id = #{typeId}
         </if>
+        <if test="maStatus != null">
+            AND d.ma_status = #{maStatus}
+        </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND d.update_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>