feat:弹窗提示信息

entity/user.go

@@ -195,7 +195,7 @@ func UserRolePowerInit(strs []string) {
 }
 
 //
-func CheckCapitalResources(capitalCode, baseUserId, appId string, entId, entUserId int64, additional Additional, permissionCode string) (title, content, confirmUrl, confirmText string, usable bool) {
+func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUserId int64) (title, content, confirmUrl, confirmText string, usable bool) {
 	OverallLock.Lock()
 	if UserCapitals[baseUserId] == nil {
 		UserCapitals[baseUserId] = map[string]int{}
@@ -211,14 +211,15 @@ func CheckCapitalResources(capitalCode, baseUserId, appId string, entId, entUser
 		permissionBool = false
 	)
 	//用户是否需要留资
-	if capitalCode != "" {
-		for _, cv := range strings.Split(capitalCode, ",") {
+	if menu.CapitalCode != "" {
+		for _, cv := range strings.Split(menu.CapitalCode, ",") {
 			userCapital := UserCapitals[baseUserId]
 			if userCapital[cv] < 0 {
-				title = additional.Title
-				content = additional.Content
-				confirmUrl = additional.ConfirmUrl
-				confirmText = additional.ConfirmText
+				//留资弹窗信息
+				title = menu.CapitalInfo.Title
+				content = menu.CapitalInfo.Content
+				confirmUrl = menu.CapitalInfo.ConfirmUrl
+				confirmText = menu.CapitalInfo.ConfirmText
 			} else {
 				if c := BaseMysql.CountBySql(`SELECT COUNT(id) FROM `+CapitalRetention+` WHERE  source = ? AND user_id = ? AND appid = ?`, cv, baseUserId, appId); c > 0 {
 					userCapital[cv] = 1
@@ -232,8 +233,8 @@ func CheckCapitalResources(capitalCode, baseUserId, appId string, entId, entUser
 		capitalBool = true
 	}
 	//资源中台--- 无权限弹窗信息为空
-	if permissionCode != "" {
-		for _, pv := range strings.Split(permissionCode, ",") {
+	if menu.PermissionCode != "" {
+		for _, pv := range strings.Split(menu.PermissionCode, ",") {
 			userPermission := UserPermissions[baseUserId]
 			if userPermission[pv] == 0 {
 				userPermission[pv] = -1
@@ -245,10 +246,11 @@ func CheckCapitalResources(capitalCode, baseUserId, appId string, entId, entUser
 				}
 			}
 			if userPermission[pv] < 0 {
-				title = ""
-				content = ""
-				confirmUrl = ""
-				confirmText = ""
+				//自定义弹窗
+				title = menu.AdditionalInfo.Title
+				content = menu.AdditionalInfo.Content
+				confirmUrl = menu.AdditionalInfo.ConfirmUrl
+				confirmText = menu.AdditionalInfo.ConfirmText
 			} else {
 				permissionBool = true
 			}

entity/workDesktop.go

@@ -3,12 +3,12 @@ package entity
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	"database/sql"
 	"github.com/zeromicro/go-zero/core/logx"
 	"sort"
 	"strconv"
 	"strings"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 )
 
 // WorkDesktopMenu 工作桌面菜单信息
@@ -156,7 +156,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 							//用户是否需要留资
 							//资源中台获取用户权限--没有权限：title等置空
 							//ResourceLib.PowerHandle()
-							title, content, confirmUrl, confirmText, usable = CheckCapitalResources(tv.CapitalCode, m.NewUserId, m.AppId, m.EntId, m.EntUserId, tv.CapitalInfo, tv.PermissionCode)
+							title, content, confirmUrl, confirmText, usable = CheckCapitalResources(tv, m.NewUserId, m.AppId, m.EntId, m.EntUserId)
 						}
 						threeLevel := &pb.ThreeLevelMenu{
 							Name:     tv.Name,
@@ -187,7 +187,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 									//用户是否需要留资
 									//资源中台获取用户权限--没有权限：title等置空
 									//ResourceLib.PowerHandle()
-									title, content, confirmUrl, confirmText, usable = CheckCapitalResources(fv.CapitalCode, m.NewUserId, m.AppId, m.EntId, m.EntUserId, fv.CapitalInfo, fv.PermissionCode)
+									title, content, confirmUrl, confirmText, usable = CheckCapitalResources(fv, m.NewUserId, m.AppId, m.EntId, m.EntUserId)
 								}
 								threeLevel.Url = MC.If(fv.Url != "", fv.Url, tv.Url).(string)
 								threeLevel.Icon = MC.If(fv.Icon != "", fv.Icon, tv.Icon).(string)