ECU

分页查询

src/main/java/com/om/service/impl/BrushFileServiceImpl.java

@@ -17,6 +17,7 @@ import com.om.service.IBrushFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.service.IClientService;
 import com.om.utils.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -109,7 +110,7 @@ public class BrushFileServiceImpl extends ServiceImpl<BrushFileMapper, BrushFile
 
         //分页查询数据库
         Page<BrushFile> page = this.lambdaQuery()
-                .like(fileName != null, BrushFile::getBrushFileName, fileName)
+                .like(StringUtils.isNotBlank(fileName), BrushFile::getBrushFileName, fileName)
                 .orderByDesc(BrushFile::getCreateTime)
                 .page(new Page<>(pageIndex, pageSize));
 

src/main/java/com/om/service/impl/DiagnosisVersionInfoServiceImpl.java

@@ -363,7 +363,9 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
             VehicleDates vehicleDates1 = BeanUtil.copyProperties(diagnosisVersionInfo, VehicleDates.class);
             vehicleDates1.setUrl(uploadUrl);
             vehicleDates1.setVersion(diagnosisVersionInfo.getVersion());
-            vehicleDates1.setFileSize(diagnosisVersionInfo.getDiagnosisFileSize());
+            double v = Double.valueOf(diagnosisVersionInfo.getDiagnosisFileSize()) * 1024 * 1024;
+
+            vehicleDates1.setFileSize((long) v);
             vehicleDates1.setBrandCn(brand.getBrandCn());
             vehicleDates1.setBrandEn(brand.getBrandEn());
             vehicleDates1.setDescription(diagnosisVersionDescribe.getDescription());