From a28ca3f36d0ace05966a8c0fac1e4b5fe921f882 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 30 十月 2024 16:25:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/dao/IndItemDao.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/dao/IndItemDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/dao/IndItemDao.java
index 3cb5a78..167d2df 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/dao/IndItemDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/dao/IndItemDao.java
@@ -6,7 +6,11 @@
import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.data.ind.item.entity.IndItemEntity;
import com.iailab.module.data.ind.item.vo.IndItemPageReqVO;
+import com.iailab.module.data.ind.item.vo.IndItemRespVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author PanZhibao
@@ -16,13 +20,16 @@
@TenantDS
@Mapper
public interface IndItemDao extends BaseMapperX<IndItemEntity> {
+ List<IndItemRespVO> getItemList(@Param("params")IndItemPageReqVO reqVO);
default PageResult<IndItemEntity> selectPage(IndItemPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<IndItemEntity>()
.likeIfPresent(IndItemEntity::getItemNo, reqVO.getItemNo())
.likeIfPresent(IndItemEntity::getItemName, reqVO.getItemName())
- .eq(IndItemEntity::getItemType, reqVO.getItemType())
- .eq(IndItemEntity::getItemCategory, reqVO.getItemCategory())
+ .eqIfPresent(IndItemEntity::getItemType, reqVO.getItemType())
+ .eqIfPresent(IndItemEntity::getItemCategory, reqVO.getItemCategory())
.orderByDesc(IndItemEntity::getCreateTime));
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3