From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java
index 86cd3a5..6095b8c 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java
@@ -49,9 +49,9 @@
@Override
public PageData<ProjectDTO> page(Map<String, Object> params) {
- IPage<ProjectDTO> page = baseDao.getPageList(
+ IPage<ProjectEntity> page = baseDao.selectPage(
getPage(params, null, false),
- params
+ getWrapper(params)
);
return getPageData(page, ProjectDTO.class);
@@ -166,10 +166,12 @@
public QueryWrapper<ProjectEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
String projectName = (String)params.get("projectName");
+ String projectCode = (String)params.get("projectCode");
QueryWrapper<ProjectEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id)
- .like(StringUtils.isNotBlank(projectName),"project_name",projectName);
+ .like(StringUtils.isNotBlank(projectName),"project_name",projectName)
+ .like(StringUtils.isNotBlank(projectCode),"project_code",projectCode);
return wrapper;
}
--
Gitblit v1.9.3