Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java

@@ -138,13 +138,16 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         }
         // 封装设备类别 使用场所 和 使用状态
         EquipmentCategory equipmentCategory = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode,elevatorDto.getCategory()));
-        elevatorDto.setCategoryName(equipmentCategory.getName());
+        if(equipmentCategory != null) {
+            elevatorDto.setCategoryName(equipmentCategory.getName());
+        }
 
         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type", "USE_SITE_CATEGORY").eq("code", elevatorDto.getUseSiteCategory());
         DataDictionary useSiteCategory = iDataDictionaryService.getOne(queryWrapper);
-        elevatorDto.setUseSiteCategoryName(useSiteCategory.getName());
-
+        if(useSiteCategory != null) {
+            elevatorDto.setUseSiteCategoryName(useSiteCategory.getName());
+        }
         if(elevatorDto.getUseStatus() == 1) {
             elevatorDto.setUseStatusStr("在用");
         } else {