root
/
thing_api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

首页路由bug修复

thing_master
xiachao 1 year ago
parent
26d9597de9
commit
90329d029c
2 changed files with 16 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java
  2. 3
      modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserMenuServiceImpl.java

30
modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java
View File

@ -146,21 +146,21 @@ public class SysUserController {
data.setShowLogo(true); data.setShowLogo(true);
data.setTitle(detail.getTitle()); 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())){ if(ObjectUtils.isNotEmpty(data.getLogo())){
data.setLogo(OSSFactory.splice(data.getLogo())); data.setLogo(OSSFactory.splice(data.getLogo()));
} }

3
modules/thing/src/main/java/com/thing/sys/biz/service/impl/SysUserMenuServiceImpl.java
View File

@ -98,8 +98,7 @@ public class SysUserMenuServiceImpl extends BaseServiceImpl<SysUserMenuMapper, S
public SysUserMenuDTO queryUrlByTenantcode(Long tenantCode) { public SysUserMenuDTO queryUrlByTenantcode(Long tenantCode) {
SysUserMenuEntity sysUserMenuEntity = mapper.selectOneByQuery(QueryWrapper.create().eq(SysUserMenuEntity::getTenantCode, tenantCode).limit(1)); SysUserMenuEntity sysUserMenuEntity = mapper.selectOneByQuery(QueryWrapper.create().eq(SysUserMenuEntity::getTenantCode, tenantCode).limit(1));
if(ObjectUtil.isNotNull(sysUserMenuEntity)){ if(ObjectUtil.isNotNull(sysUserMenuEntity)){
// sysUserMenuEntity.setLogo(OSSFactory.splice(sysUserMenuEntity.getLogo()));
sysUserMenuEntity.setLogo(OSSFactory.splice(sysUserMenuEntity.getLogo()));
return ConvertUtils.convertWithTypeAdapt(sysUserMenuEntity,SysUserMenuDTO.class); return ConvertUtils.convertWithTypeAdapt(sysUserMenuEntity,SysUserMenuDTO.class);
} }
return new SysUserMenuDTO(); return new SysUserMenuDTO();

Write Preview
Loading…
Cancel
Save