From 7dac2613c364207ac87d2540bec1f231ddfc91e0 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Thu, 6 Jul 2023 11:05:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E7=BC=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/defect/service/impl/OperDefectServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
index e9944b7..83a2c6d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
@@ -173,6 +173,9 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
             if (Func.isNotEmpty(defectVO.getIsDiagnosis())) {
                 queryWrapper.eq(OperDefectEntity::getIsDiagnosis, defectVO.getIsDiagnosis());
             }
+            if (Func.isNotEmpty(defectVO.getFaultName())) {
+                queryWrapper.like(OperDefectEntity::getFaultName, defectVO.getFaultName());
+            }
         }
         queryWrapper.orderByDesc(OperDefectEntity::getCreateTime);
         return queryWrapper;

From 06a376084468f0dfffd04e47e7c68f6e54d60c88 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 6 Jul 2023 11:07:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?#=E8=AE=BE=E5=A4=87=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
index fae049a..e9bfa04 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
@@ -91,7 +91,7 @@
          SELECT * FROM `hzims_em_info` WHERE IS_DELETED = 0 AND HOME_PAGE_DISPLAY = 1 and `NUMBER` = #{emCode}
     </select>
     <select id="selectEminfoAndEmParamVoList" resultType="com.hnac.hzims.equipment.vo.EminfoAndEmParamVo">
-        SELECT ID AS id, `NAME` as name,`NUMBER` as emCode,CREATE_DEPT as createDept,RUN_STATUS as runStatus,EM_INDEX as ord FROM `hzims_em_info` WHERE IS_DELETED = 0 AND HOME_PAGE_DISPLAY = 1
+        SELECT ID AS id, `NAME` as name,`NUMBER` as emCode,CREATE_DEPT as createDept,RUN_STATUS as runStatus,IFNULL(EM_INDEX,1) as ord FROM `hzims_em_info` WHERE IS_DELETED = 0 AND HOME_PAGE_DISPLAY = 1
     </select>
 
     <update id="updateBachEmState">