Merge remote-tracking branch 'origin/master'

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">

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;