【fix】查询设备防止空指针

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDeviceRegisterServiceImpl.java

@@ -139,8 +139,14 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         for (EartagDeviceRegister record : page.getRecords()) {
             EartagDeviceRegisterVo eartagDeviceRegisterVo = new EartagDeviceRegisterVo();
             BeanUtil.copyProperties(record,eartagDeviceRegisterVo);
-            eartagDeviceRegisterVo.setPigpenName(basePigpenMapper.selectById(record.getPigpenId()).getPigpenName());
-            eartagDeviceRegisterVo.setUnitName(basePigpenMapper.selectById(record.getUnitId()).getPigpenName());
+            if (record.getPigpenId() != null){
+                eartagDeviceRegisterVo.setPigpenName(basePigpenMapper.selectById(record.getPigpenId()).getPigpenName());
+            }
+
+            if (record.getPigpenId() != null){
+                eartagDeviceRegisterVo.setUnitName(basePigpenMapper.selectById(record.getUnitId()).getPigpenName());
+            }
+
             listVo.add(eartagDeviceRegisterVo);
         }