feat:工作桌面

entity/user.go

@@ -196,7 +196,7 @@ func UserRolePowerInit(strs []string) {
 }
 
 //
-func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUserId int64, b bool) (title, content, confirmUrl, confirmText string, usable bool) {
+func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUserId int64, b bool) (title, content, confirmUrl, confirmText, appType, openType string, isShowCancel, usable bool) {
 	OverallLock.Lock()
 	if UserCapitals[baseUserId] == nil {
 		UserCapitals[baseUserId] = map[string]int{}
@@ -222,6 +222,9 @@ func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUse
 				content = menu.CapitalInfo.Content
 				confirmUrl = menu.CapitalInfo.ConfirmUrl
 				confirmText = menu.CapitalInfo.ConfirmText
+				isShowCancel = menu.CapitalInfo.IsShowCancel
+				appType = menu.CapitalInfo.AppType
+				openType = menu.CapitalInfo.OpenType
 			} 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
@@ -258,6 +261,9 @@ func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUse
 						content = menu.AdditionalInfo.Content
 						confirmUrl = menu.AdditionalInfo.ConfirmUrl
 						confirmText = menu.AdditionalInfo.ConfirmText
+						isShowCancel = menu.AdditionalInfo.IsShowCancel
+						appType = menu.AdditionalInfo.AppType
+						openType = menu.AdditionalInfo.OpenType
 					} else {
 						title = ""
 						permissionBool = true

entity/workDesktop.go

@@ -149,14 +149,14 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 							continue
 						}
 						var (
-							title, content, confirmUrl, confirmText = tv.AdditionalInfo.Title, tv.AdditionalInfo.Content, tv.AdditionalInfo.ConfirmUrl, tv.AdditionalInfo.ConfirmText
+							title, content, confirmUrl, confirmText, isShowCancel, appType, openType = tv.AdditionalInfo.Title, tv.AdditionalInfo.Content, tv.AdditionalInfo.ConfirmUrl, tv.AdditionalInfo.ConfirmText, tv.AdditionalInfo.IsShowCancel, tv.AdditionalInfo.AppType, tv.AdditionalInfo.OpenType
 						)
 						//三级菜单------
 						if len(tv.Children) == 0 && (tv.CapitalCode != "" || tv.PermissionCode != "") {
 							//用户是否需要留资
 							//资源中台获取用户权限--没有权限：title等置空
 							//ResourceLib.PowerHandle()
-							title, content, confirmUrl, confirmText, usable = CheckCapitalResources(tv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
+							title, content, confirmUrl, confirmText, appType, openType, isShowCancel, usable = CheckCapitalResources(tv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
 						}
 						threeLevel := &pb.ThreeLevelMenu{
 							Name:     tv.Name,
@@ -171,9 +171,9 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 								Content:      content,
 								ConfirmUrl:   confirmUrl,
 								ConfirmText:  confirmText,
-								IsShowCancel: tv.AdditionalInfo.IsShowCancel,
-								AppType:      tv.AdditionalInfo.AppType,
-								OpenType:     tv.AdditionalInfo.OpenType,
+								IsShowCancel: isShowCancel,
+								AppType:      appType,
+								OpenType:     openType,
 							},
 							Match: MC.If(tv.Match != "", strings.Split(tv.Match, ","), []string{}).([]string),
 						}
@@ -187,9 +187,8 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 									//用户是否需要留资
 									//资源中台获取用户权限--没有权限：title等置空
 									//ResourceLib.PowerHandle()
-									title, content, confirmUrl, confirmText, usable = CheckCapitalResources(fv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
+									title, content, confirmUrl, confirmText, appType, openType, isShowCancel, usable = CheckCapitalResources(fv, m.NewUserId, m.AppId, m.EntId, m.EntUserId, usable)
 								}
-								logx.Info(title, "--", content, "--", fv.AdditionalInfo, "--", fv.CapitalInfo)
 								threeLevel.Url = MC.If(fv.Url != "", fv.Url, tv.Url).(string)
 								threeLevel.Icon = MC.If(fv.Icon != "", fv.Icon, tv.Icon).(string)
 								threeLevel.AppType = fv.AppType
@@ -201,9 +200,9 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 										Content:      content,
 										ConfirmUrl:   confirmUrl,
 										ConfirmText:  confirmText,
-										IsShowCancel: fv.AdditionalInfo.IsShowCancel,
-										AppType:      fv.AdditionalInfo.AppType,
-										OpenType:     fv.AdditionalInfo.OpenType,
+										IsShowCancel: isShowCancel,
+										AppType:      appType,
+										OpenType:     openType,
 									}
 								}
 								threeLevel.Match = MC.If(fv.Match != "", strings.Split(fv.Match, ","), []string{}).([]string)