fix(装备模块): 修复了bug

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -1184,7 +1184,14 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         if (!CollectionUtils.isEmpty(deviceIds)){
             //添加装备日志
             deviceIds.forEach(integer -> {
-                if (!updateStorageLocationVo.getStorageLocationId().equals(getOne(integer).getStorageLocationId())){
+//                if (updateStorageLocationVo.getStorageLocationId() != (getOne(integer).getStorageLocationId())){
+//                    DeviceLogDto deviceLogDto= new DeviceLogDto(integer,"将存放位置修改为"+
+//                            updateStorageLocationVo.getStorageLocation(),null,userId);
+//                    deviceLogDtos.add(deviceLogDto);
+//                }});
+                Integer storageLocationId = updateStorageLocationVo.getStorageLocationId();
+                Integer dataStorageLocationId = getOne(integer).getStorageLocationId();
+                if (storageLocationId == null ? dataStorageLocationId == null : storageLocationId.equals(dataStorageLocationId)){
                     DeviceLogDto deviceLogDto= new DeviceLogDto(integer,"将存放位置修改为"+
                             updateStorageLocationVo.getStorageLocation(),null,userId);
                     deviceLogDtos.add(deviceLogDto);
@@ -1284,8 +1291,12 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
         BeanUtils.copyProperties(queryTheWarehouseVo,deviceLibrarySelectVo);
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
-        Specification<DeviceLibrary> or =
-                predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo.getNonStorageLocationId()).build());
+        Specification<DeviceLibrary> or = null;
+        if (deviceLibrarySelectVo.getNonStorageLocationId()!=null){
+          or = predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo.getNonStorageLocationId()).build());
+        }else {
+            or = predicateBuilder.build();
+        }
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(or);
         deviceLibraries.forEach(DeviceLibrary::setConfigName);
         //拿到所有的装备id