fix: 备品保存空指针、列表缺失缩略图问题处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlSpareEquipmentServiceImpl.java

@@ -26,10 +26,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -71,8 +68,10 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
     public WlSpareEquipment saveOrUpdateSpareEquipment(WlSpareEquipment wlSpareEquipment, ReginParams reginParams) {
         wlSpareEquipment.setBizOrgName(reginParams.getPersonIdentity().getCompanyName());
         wlSpareEquipment.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
-        WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(wlSpareEquipment.getWarehouseStructureId());
-        wlSpareEquipment.setWarehouseStructureCode(warehouseStructure.getCode());
+        if (Objects.nonNull(wlSpareEquipment.getWarehouseStructureId())) {
+            WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(wlSpareEquipment.getWarehouseStructureId());
+            wlSpareEquipment.setWarehouseStructureCode(warehouseStructure.getCode());
+        }
         if (ObjectUtils.isEmpty(wlSpareEquipment.getId())) {
             wlSpareEquipmentMapper.insert(wlSpareEquipment);
         } else {
@@ -147,7 +146,13 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
 
     @Override
     public Page<WlSpareEquipment> listByPage(WlSpareEquipment dto, Page page, int hierarchy, String codeHead) {
-        return wlSpareEquipmentMapper.listByPage(page, dto, hierarchy, codeHead);
+        Page<WlSpareEquipment> wlSpareEquipmentPage = wlSpareEquipmentMapper.listByPage(page, dto, hierarchy, codeHead);
+        List<WlSpareEquipment> records = wlSpareEquipmentPage.getRecords();
+        for (WlSpareEquipment record : records) {
+            record.setImg(getEquipFileList(record.getId(), FileTypeEnum.image.toString()));
+        }
+        wlSpareEquipmentPage.setRecords(records);
+        return wlSpareEquipmentPage;
     }
 
     @Override