2

internal/pkg/tpl/render.go

@@ -4,7 +4,7 @@ import (
 	"html/template"
 	"net/http"
 
-	systemv1 "management/internal/erpserver/biz/v1/system"
+	v1 "management/internal/erpserver/service/v1"
 	"management/internal/pkg/session"
 )
 
@@ -17,17 +17,17 @@ type Renderer interface {
 }
 
 type render struct {
-	session   session.ISession
+	session   session.Session
 	config    *TemplateConfig
 	templates map[string]*template.Template
 
-	menuBiz systemv1.MenuBiz
+	menusvc v1.MenuService
 }
 
-func New(session session.ISession, menuBiz systemv1.MenuBiz) (Renderer, error) {
+func New(session session.Session, menusvc v1.MenuService) (Renderer, error) {
 	render := &render{
 		session: session,
-		menuBiz: menuBiz,
+		menusvc: menusvc,
 		config: &TemplateConfig{
 			Root:      ".",
 			Extension: ".tmpl",

internal/pkg/tpl/util.go

@@ -44,15 +44,14 @@ func (r *render) setDefaultData(req *http.Request, data map[string]any) map[stri
 func (r *render) getCurrentPathBtns(ctx context.Context, roleID int32, path string) []*dto.OwnerMenuDto {
 	var res []*dto.OwnerMenuDto
 
-	// 获取当前path的菜单
-	menu, err := r.menuBiz.GetSysMenuByUrl(ctx, path)
+	// 获取当前登陆角色的权限
+	menus, err := r.menusvc.ListByRoleIDToMap(ctx, roleID)
 	if err != nil {
 		return res
 	}
 
-	// 获取权限
-	menus, err := r.menuBiz.ListOwnerMenuByRoleID(ctx, roleID)
-	if err != nil {
+	menu, ok := menus[path]
+	if !ok {
 		return res
 	}