From 79df89dbef1ad9fe1710d89e410e3973de33bf3d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 九月 2024 15:16:12 +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 | 11 ++++++++++-
1 files changed, 10 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 0234815..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;
}
@@ -227,7 +235,7 @@
Velocity.init(prop);
//生成menu.xml文件
- Map<String, Map<String, List<MpkFileDTO>>> collect = entities.stream().collect(Collectors.groupingBy(MpkFileDTO::getMenuName, Collectors.groupingBy(e -> StringUtils.isNotBlank(e.getGroupName()) ? e.getGroupName() : "default_group")));
+ LinkedHashMap<String, LinkedHashMap<String, List<MpkFileDTO>>> collect = entities.stream().collect(Collectors.groupingBy(MpkFileDTO::getMenuName, LinkedHashMap::new, Collectors.groupingBy(e -> StringUtils.isNotBlank(e.getGroupName()) ? e.getGroupName() : "default_group",LinkedHashMap::new,Collectors.toList())));
Map<String, Object> map1 = new HashMap<>();
map1.put("collects", collect);
File xmlFile = new File(dirPath.getAbsolutePath() + File.separator + "menu.xml");
@@ -319,6 +327,7 @@
entity.setProjectId(projectId);
entity.setPackageHistoryId(historyId);
entity.setPyName(e.getPyName());
+ entity.setPyChineseName(e.getPyChineseName());
entity.setPkgName(e.getPkgName());
entity.setPyModule(e.getPyModule());
entity.setRemark(e.getRemark());
--
Gitblit v1.9.3