|
|
@@ -12,13 +12,15 @@ import com.jzg.mapper.SysMenuMapper;
|
|
|
import com.jzg.mapper.SysSystemMenuMapper;
|
|
|
import com.jzg.mapper.SysUserRoleMapper;
|
|
|
import com.jzg.service.SysMenuService;
|
|
|
-import com.jzg.service.SysUserService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Collections;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -28,7 +30,7 @@ import java.util.stream.Collectors;
|
|
|
public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
implements SysMenuService {
|
|
|
|
|
|
- private final SysUserService sysUserService;
|
|
|
+ private static final Logger log = LoggerFactory.getLogger(SysMenuServiceImpl.class);
|
|
|
|
|
|
private final SysMenuMapper sysMenuMapper;
|
|
|
|
|
|
@@ -62,6 +64,11 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
@Override
|
|
|
public List<SysMenu> getRoleMenuTree(String systemCode, String userId) {
|
|
|
SysUserRole sysUserRole = sysUserRoleMapper.selectByUserIdAndSysCodeOne(userId,systemCode);
|
|
|
+ // modify by lipf ,2026年4月3日08:52:05, 解决NPE 异常
|
|
|
+ if(sysUserRole == null){
|
|
|
+ log.info("租户[{}]下的用户[{}]角色为空",systemCode, userId);
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
List<SysMenu> menus = this.getMenuByRoleId(sysUserRole.getRoleId());
|
|
|
List<SysMenu> sysMenus = new ArrayList<>();
|
|
|
for (SysMenu menu : menus) {
|