From 7fce3006ecd0b670e33c2d3ba123778e79e2e943 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 09:18:25 +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/FileMenuServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/FileMenuServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/FileMenuServiceImpl.java
index aeb8c59..e3ccd38 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/FileMenuServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/FileMenuServiceImpl.java
@@ -12,6 +12,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.UUID;
/**
* @author PanZhibao
@@ -34,7 +35,7 @@
wrapper.orderByAsc("sort");
List<FileMenuDTO> list = ConvertUtils.sourceToTarget(fileMenuDao.selectList(wrapper), FileMenuDTO.class);
list.forEach(item -> {
- fileGroupService.list(item.getId());
+ item.setGroups(fileGroupService.list(item.getId()));
});
return list;
}
@@ -45,13 +46,14 @@
}
@Override
- public void create(FileMenuEntity fileMenuEntity) {
- fileMenuDao.insert(fileMenuEntity);
+ public void create(FileMenuEntity entity) {
+ entity.setId(UUID.randomUUID().toString());
+ fileMenuDao.insert(entity);
}
@Override
- public void update(FileMenuEntity fileMenuEntity) {
- fileMenuDao.updateById(fileMenuEntity);
+ public void update(FileMenuEntity entity) {
+ fileMenuDao.updateById(entity);
}
@Override
--
Gitblit v1.9.3