From a99834962622f6ca8a7f5e4e42581d35d6f59f8a Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 05 十二月 2024 15:48:26 +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/MpkFileServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
index 4de8772..ecac7f6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
@@ -87,9 +87,10 @@
@Override
public List<MpkFileDTO> list(Map<String, Object> params) {
- List<MpkFileEntity> entityList = baseDao.selectList(getWrapper(params).orderByDesc("create_date"));
+// List<MpkFileEntity> entityList = baseDao.selectList(getWrapper(params).orderByDesc("create_date"));
+ List<MpkFileDTO> list = baseDao.list(params);
- return ConvertUtils.sourceToTarget(entityList, MpkFileDTO.class);
+ return list;
}
private QueryWrapper<MpkFileEntity> getWrapper(Map<String, Object> params) {
@@ -99,7 +100,7 @@
String label = (String) params.get("label");
QueryWrapper<MpkFileEntity> wrapper = new QueryWrapper<>();
- wrapper.like(StringUtils.isNotBlank(pyName), "py_name", pyName)
+ wrapper.like(StringUtils.isNotBlank(pyName), "py_chinese_name", pyName)
.eq(StringUtils.isNotBlank(pyType), "py_type", pyType)
.like(StringUtils.isNotBlank(remark), "remark", remark);
--
Gitblit v1.9.3