From 330001d0433b05e82779b4c5e945ad7ed4eaa50b Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 九月 2024 19:01: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 | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 ac4490c..b167e85 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,11 +94,19 @@
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_name", pyName)
.eq(StringUtils.isNotBlank(pyType), "py_type", pyType)
.like(StringUtils.isNotBlank(remark), "remark", remark);
+
+ if (StringUtils.isNotBlank(label)) {
+ wrapper.and(w -> {
+ w.eq(StringUtils.isNotBlank(label),"menu_name", label)
+ .or().eq(StringUtils.isNotBlank(label),"group_name", label);
+ });
+ }
return wrapper;
}
--
Gitblit v1.9.3