2024-02-05 提交

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<EamDefectData> 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<EamDefectData> checkEamDefect=eamDao.checkEamDefect(inData);
-        if(checkEamDefect.size()==0){
+        if(checkEamDefect.isEmpty()){
             throw new RuntimeException("该故障编码不存在请刷新数据!");
         }
         eamDao.eamDefectEdit(inData);

src/main/resources/mapper/pms/EamMapper.xml

@@ -910,9 +910,6 @@
                 fault_type
              FROM eam_defect
             <where>
-                <if test="query.buDesc != null and query.buDesc != ''">
-                    AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
-                </if>
                  <if test="query.defectID != null and query.defectID != ''">
                     AND defectID like '%' + #{query.defectID} + '%'
                 </if>
@@ -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
             <where>
                  <if test="query.objectID != null and query.objectID != ''">
                     AND a.ObjectID like '%' + #{query.objectID} + '%'