初始化项目

ema-admin/src/main/java/com/ema/admin/modules/assets/service/impl/AssetStatusHistoryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ema.admin.modules.assets.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
@@ -30,25 +31,11 @@ public class AssetStatusHistoryServiceImpl extends ServiceImpl<AssetStatusHistor
     @Override
     public Page<AssetStatusHistory> page(AssetStatusHistoryQueryVo queryVo) {
         QueryWrapper queryWrapper = QueryWrapper.create();
-        
-        if (queryVo.getAssetId() != null && !queryVo.getAssetId().isEmpty()) {
-            queryWrapper.eq(AssetStatusHistory::getAssetId, queryVo.getAssetId());
-        }
-        if (queryVo.getUseStatus() != null && !queryVo.getUseStatus().isEmpty()) {
-            queryWrapper.eq(AssetStatusHistory::getUseStatus, queryVo.getUseStatus());
-        }
-        if (queryVo.getUseDept() != null && !queryVo.getUseDept().isEmpty()) {
-            queryWrapper.like(AssetStatusHistory::getUseDept, queryVo.getUseDept());
-        }
-        if (queryVo.getUseUser() != null && !queryVo.getUseUser().isEmpty()) {
-            queryWrapper.like(AssetStatusHistory::getUseUser, queryVo.getUseUser());
-        }
-        
+        queryWrapper.eq(AssetStatusHistory::getAssetId, queryVo.getAssetId(), StrUtil.isNotBlank(queryVo.getAssetId()));
+        queryWrapper.eq(AssetStatusHistory::getUseStatus, queryVo.getUseStatus(), StrUtil.isNotBlank(queryVo.getUseStatus()));
+        queryWrapper.like(AssetStatusHistory::getUseDept, queryVo.getUseDept(), StrUtil.isNotBlank(queryVo.getUseDept()));
+        queryWrapper.like(AssetStatusHistory::getUseUser, queryVo.getUseUser(), StrUtil.isNotBlank(queryVo.getUseUser()));
         queryWrapper.orderBy(AssetStatusHistory::getOperatorDate, false);
-        
-        int pageNumber = queryVo.getPageNumber() != null ? queryVo.getPageNumber() : 1;
-        int pageSize = queryVo.getPageSize() != null ? queryVo.getPageSize() : 10;
-        
-        return paginate(pageNumber, pageSize, queryWrapper);
+        return this.page(new Page<>(queryVo.getPageNumber(), queryVo.getPageSize()), queryWrapper);
     }
 }