From b8a0affd03b5fa9fa33cd6f870e90394c2df86c7 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/app/AppServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/app/AppServiceImpl.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/app/AppServiceImpl.java
index dd0be59..43bcb42 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/app/AppServiceImpl.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/app/AppServiceImpl.java
@@ -29,6 +29,7 @@
import com.iailab.module.system.service.permission.MenuService;
import com.iailab.module.system.service.permission.PermissionService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -150,7 +151,7 @@
public AppDO getAppByTenantId(Long tenantId) {
//暂时支持一个租户对应一个应用
List<AppDO> appDOS = appMapper.selectList(new LambdaQueryWrapper<AppDO>().eq(AppDO::getTenantId, tenantId));
- if(ObjectUtils.isNotEmpty(appDOS)) {
+ if(CollectionUtils.isNotEmpty(appDOS)) {
return appDOS.get(0);
} else {
AppDO appDO = new AppDO();
@@ -194,6 +195,7 @@
if(type == 1){
menuDO.setCreator(loginUserNickname);
menuDO.setCreateTime(app.getCreateTime());
+ menuDO.setIcon("fa-solid:border-none"); //默认icon
menuMapper.insert(menuDO);
// //内置租户角色分配菜单
// assignRoleMenu(menuDO.getId(), app.getTenantId());
@@ -219,6 +221,7 @@
LambdaQueryWrapperX<MenuDO> menuWrapper = new LambdaQueryWrapperX<>();
menuWrapper.eq(MenuDO::getAppId, app.getId());
menuWrapper.eq(MenuDO::getType, MenuTypeEnum.DIR.getType());
+ menuWrapper.eq(MenuDO::getParentId, 0);
MenuDO menu = menuMapper.selectOne(menuWrapper);
TenantDO tenantDO = tenantMapper.selectById(app.getTenantId());
if(ObjectUtils.isNotEmpty(menu) && ObjectUtils.isNotEmpty(tenantDO)) {
--
Gitblit v1.9.3