From a452e01cf489b546ebe65e08fcb1213b30e60cfa Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 15:25:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
index c117747..78c9c6f 100644
--- a/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
@@ -10,6 +10,8 @@
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
import java.util.List;
@@ -22,6 +24,10 @@
@Override
public IPage<EnterpriseFixedAssets> listPage(Page<EnterpriseFixedAssets> page, EnterpriseFixedAssets enterpriseFixedAssets) {
- return enterpriseFixedAssetsmapper.selectPage(page, null);
+ LambdaQueryWrapper<EnterpriseFixedAssets> queryWrapper = new LambdaQueryWrapper<>();
+ if (enterpriseFixedAssets != null && StringUtils.isNotBlank(enterpriseFixedAssets.getName())) {
+ queryWrapper.like(EnterpriseFixedAssets::getName, enterpriseFixedAssets.getName());
+ }
+ return enterpriseFixedAssetsmapper.selectPage(page, queryWrapper);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3