Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-04 85bafa86f44fbe6646019fd8ecbab79f552ccd0a

 xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysPermissionServiceImpl.java

@@ -4,19 +4,16 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import com.xiaopeng.account.service.ISysGroupMenuService;
import com.xiaopeng.account.service.ISysPermissionService;
import com.xiaopeng.account.service.ISysRoleService;
import com.xiaopeng.account.service.ISysUserRoleService;
import com.xiaopeng.api.feign.operation.RemoteMenuService;
import com.xiaopeng.api.feignClient.operation.SysMenuClient;
import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.api.model.account.SysUserRole;
import com.xiaopeng.api.model.operation.SysMenu;
import com.xiaopeng.common.core.constant.SecurityConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +39,7 @@
    private ISysGroupMenuService groupMenuService;

    @Autowired
    private RemoteMenuService remoteMenuService;
    private SysMenuClient sysMenuClient;

    /**
     * 获取角色数据权限
@@ -104,7 +101,7 @@
            }

            // 4. 通过 Feign 调用 operation 服务，根据 menuId 列表获取菜单列表
            R<List<SysMenu>> result = remoteMenuService.getMenusByMenuIds(menuIds);
            R<List<SysMenu>> result = sysMenuClient.getMenusByMenuIds(menuIds);
            if (R.isSuccess(result) && result.getData() != null) {
                menus = result.getData();
            } else {