From b9a19ac538b7750fe6a042a99e57e23fa4c9580d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 11 十二月 2024 18:29:56 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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 ecac7f6..47ec99b 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
@@ -94,13 +94,15 @@
     }
 
     private QueryWrapper<MpkFileEntity> getWrapper(Map<String, Object> params) {
+        String pyChineseName = (String) params.get("pyChineseName");
         String pyName = (String) params.get("pyName");
         String pyType = (String) params.get("pyType");
         String remark = (String) params.get("remark");
         String label = (String) params.get("label");
 
         QueryWrapper<MpkFileEntity> wrapper = new QueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(pyName), "py_chinese_name", pyName)
+        wrapper.like(StringUtils.isNotBlank(pyChineseName), "py_chinese_name", pyChineseName)
+                .like(StringUtils.isNotBlank(pyName), "py_name", pyName)
                 .eq(StringUtils.isNotBlank(pyType), "py_type", pyType)
                 .like(StringUtils.isNotBlank(remark), "remark", remark);
 

--
Gitblit v1.9.3