From 90329d029c6b6a9278b9162299d6d6e45c2c3f25 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Tue, 14 Jan 2025 16:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=AF=E7=94=B1bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/biz/controller/SysUserController.java | 30 +++++++++----------
 .../service/impl/SysUserMenuServiceImpl.java  |  3 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java
index 2d4b5a5..b8d6854 100644
--- a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java
+++ b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java
@@ -146,21 +146,21 @@ public class SysUserController {
 			data.setShowLogo(true);
 			data.setTitle(detail.getTitle());
 		}
-//		SysUserMenuDTO userMenuDTO =sysUserMenuService.queryUrlByTenantcode(tcode);
-//		if (ObjectUtil.isNotNull(userMenuDTO)){
-//			data.setUrl(userMenuDTO.getUrl());
-//			data.setLogo(StringUtils.isNotBlank(userMenuDTO.getLogo()) ? userMenuDTO.getLogo() : data.getLogo());
-//			data.setName(StringUtils.isNotBlank(userMenuDTO.getName()) ? userMenuDTO.getName() : data.getName());
-//			data.setShowLogo(userMenuDTO.getShowLogo());
-//		}else {
-//			//SysUserMenuDTO sysUserMenuDTO = sysUserMenuService.getSysUserMenuByUserId(data.getId());
-//			SysTenantDetailDTO detail = sysTenantDetailService.getDetail(TenantContext.getTenantCode(user));
-//			if (ObjectUtil.isNotNull(detail)){
-//				data.setLogo(StringUtils.isNotBlank(detail.getLogoUrl()) ? detail.getLogoUrl() : null);
-//				data.setName(StringUtils.isNotBlank(detail.getName()) ? detail.getName() : null);
-//				data.setShowLogo(true);
-//			}
-//		}
+		SysUserMenuDTO userMenuDTO =sysUserMenuService.queryUrlByTenantcode(tcode);
+		if (ObjectUtil.isNotNull(userMenuDTO)){
+			data.setUrl(userMenuDTO.getUrl());
+			data.setLogo(StringUtils.isNotBlank(userMenuDTO.getLogo()) ? userMenuDTO.getLogo() : data.getLogo());
+			data.setName(StringUtils.isNotBlank(userMenuDTO.getName()) ? userMenuDTO.getName() : data.getName());
+			data.setShowLogo(userMenuDTO.getShowLogo());
+		}else {
+//			SysUserMenuDTO sysUserMenuDTO = sysUserMenuService.getSysUserMenuByUserId(data.getId());
+			SysTenantDetailDTO details = sysTenantDetailService.getDetail(TenantContext.getTenantCode(user));
+			if (ObjectUtil.isNotNull(details)){
+				data.setLogo(StringUtils.isNotBlank(details.getLogoUrl()) ? details.getLogoUrl() : null);
+				data.setName(StringUtils.isNotBlank(details.getName()) ? details.getName() : null);
+				data.setShowLogo(true);
+			}
+		}
 		if(ObjectUtils.isNotEmpty(data.getLogo())){
 			data.setLogo(OSSFactory.splice(data.getLogo()));
 		}
diff --git a/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserMenuServiceImpl.java b/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserMenuServiceImpl.java
index a399b1e..face889 100644
--- a/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserMenuServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserMenuServiceImpl.java
@@ -98,8 +98,7 @@ public class SysUserMenuServiceImpl extends BaseServiceImpl<SysUserMenuMapper, S
     public SysUserMenuDTO queryUrlByTenantcode(Long tenantCode) {
         SysUserMenuEntity sysUserMenuEntity = mapper.selectOneByQuery(QueryWrapper.create().eq(SysUserMenuEntity::getTenantCode, tenantCode).limit(1));
         if(ObjectUtil.isNotNull(sysUserMenuEntity)){
-            // sysUserMenuEntity.setLogo(OSSFactory.splice(sysUserMenuEntity.getLogo()));
-
+            sysUserMenuEntity.setLogo(OSSFactory.splice(sysUserMenuEntity.getLogo()));
             return ConvertUtils.convertWithTypeAdapt(sysUserMenuEntity,SysUserMenuDTO.class);
         }
         return new SysUserMenuDTO();