diff --git a/src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java b/src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java index 8afcc3b..da7c96b 100644 --- a/src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java +++ b/src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java @@ -1521,7 +1521,7 @@ public class EamServiceImpl implements EamService { public ResponseData eamDefectSave(EamDefectData inData){ ResponseData responseData = new ResponseData(); List checkEamDefect = eamDao.checkEamDefect(inData); - if(checkEamDefect.size() > 0) { + if(!checkEamDefect.isEmpty()) { throw new RuntimeException("该故障编码已存在!"); } eamDao.saveNewEamDefect(inData); @@ -1535,7 +1535,7 @@ public class EamServiceImpl implements EamService { public ResponseData eamDefectEdit(EamDefectData inData){ ResponseData responseData=new ResponseData(); List checkEamDefect=eamDao.checkEamDefect(inData); - if(checkEamDefect.size()==0){ + if(checkEamDefect.isEmpty()){ throw new RuntimeException("该故障编码不存在请刷新数据!"); } eamDao.eamDefectEdit(inData); diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 69dd5d8..cd3b32a 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -910,9 +910,6 @@ fault_type FROM eam_defect - - AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc} - AND defectID like '%' + #{query.defectID} + '%' @@ -940,8 +937,8 @@ a.update_date, a.update_by FROM eam_object_defect a - left join eam_object b on a.site=b.site and a.ObjectID=b.ObjectID - left join eam_defect c on a.DefectID=c.DefectID + left join eam_object b on a.site=b.site and a.ObjectID = b.ObjectID + left join eam_defect c on a.DefectID = c.DefectID AND a.ObjectID like '%' + #{query.objectID} + '%'