lnl，bug修改

“linengliang”

2023-08-22 44546c7c5f41b670f18cc520a9b863973ecf3b25

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -58,7 +59,7 @@

    @Autowired
   private IEamEquipmentService equipmentService;
	

   /**
    * 分页列表查询
    *
@@ -92,7 +93,7 @@
      IPage<EquipmentUnseal> pageList = equipmentUnsealService.page(page, queryWrapper);
      return Result.OK(pageList);
   }
	

   /**
    *   添加
    *
@@ -109,7 +110,7 @@
      equipmentUnsealService.saveMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
      return Result.OK("添加成功！");
   }
	

   /**
    *  编辑
    *
@@ -130,7 +131,7 @@
      equipmentUnsealService.updateMain(equipmentUnseal, equipmentUnsealPage.getEquipmentUnsealDetailList());
      return Result.OK("编辑成功!");
   }
	

   /**
    *   通过id删除
    *
@@ -145,7 +146,7 @@
      equipmentUnsealService.delMain(id);
      return Result.OK("删除成功!");
   }
	

   /**
    *  批量删除
    *
@@ -160,7 +161,7 @@
      this.equipmentUnsealService.delBatchMain(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功！");
   }
	

   /**
    * 通过id查询
    *
@@ -178,7 +179,7 @@
      return Result.OK(equipmentUnseal);

   }
	

   /**
    * 通过id查询
    *
@@ -293,7 +294,10 @@
       for (EquipmentUnsealDetail record : pageList.getRecords()) {
          String equipmentId = record.getEquipmentId();
          Equipment equipment = equipmentService.getById(equipmentId);
          record.setEquipmentPhoto(equipment.getEquipmentPhoto());
          if(ObjectUtils.isNotNull(equipment)&&StringUtils.isNotBlank(equipment.getEquipmentPhoto())){
             record.setEquipmentPhoto(equipment.getEquipmentPhoto());
          }

       }
       return Result.OK(pageList);
    }