解决npe问题

SZH

2023-03-09 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/MaterialReceiveRecordsServiceImpl.java

@@ -27,6 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -216,4 +217,29 @@
        return list;
    }

    @Override
    public MaterialReceiveRecordsBaseDto queryById(ContextCacheUser currentUser, Long id) {
        if(ObjectUtils.isEmpty(id)){
            throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL,"领取总记录主键不可为空！");
        }
        MaterialReceiveRecordsBaseInfo receiveRecordsBaseInfo = recordsBaseInfoService.queryById(id);
        List<MaterialReceiveRecordsInfo> receiveRecordsInfoList = receiveRecordsInfoService.listByReceiveBaseId(id);
        MaterialReceiveRecordsBaseDto materialReceiveRecordsBaseDto = new MaterialReceiveRecordsBaseDto();
        if(!ObjectUtils.isEmpty(receiveRecordsBaseInfo)){
            BeanUtils.copyProperties(receiveRecordsBaseInfo,materialReceiveRecordsBaseDto);
            List<MaterialReceiveRecordsDto> receiveRecordsDtoList = new ArrayList<>();
            for(MaterialReceiveRecordsInfo receiveRecordsInfo:receiveRecordsInfoList){
                MaterialReceiveRecordsDto receiveRecordsDto = new MaterialReceiveRecordsDto();
                BeanUtils.copyProperties(receiveRecordsInfo,receiveRecordsDto);
                receiveRecordsDto.setMaterialStatusName(MaterialStatusEnum.getByCode(receiveRecordsInfo.getMaterialStatus()).getValue());
                receiveRecordsDto.setRevertStatusName(MaterialRevertStatusEnum.getByCode(receiveRecordsInfo.getRevertStatus()).getValue());
                receiveRecordsDtoList.add(receiveRecordsDto);
            }
            materialReceiveRecordsBaseDto.setMaterialList(receiveRecordsDtoList);
            return materialReceiveRecordsBaseDto;
        }

       return null;
    }

}