zss
2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d
cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java
@@ -76,11 +76,7 @@
    @Override
    public IPage<DeviceDto> selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull) {
        itemParameter.setCreateUser(SecurityUtils.getUserId().intValue());
        String storagePoint = itemParameter.getStoragePoint();//存放点
        itemParameter.setStoragePoint(null);
        QueryWrapper<DeviceDto> wrapper = QueryWrappers.queryWrappers(itemParameter).eq(StringUtils.isNotBlank(storagePoint), "storage_point", storagePoint);
        IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, wrapper, laboratoryNameIsNull);
        IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(itemParameter), laboratoryNameIsNull);
        return iPage;
    }