feat:医械通权限调整

entity/user.go

@@ -242,45 +242,52 @@ func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUse
 	var (
 		capitalBool    = false
 		permissionBool = false
+		customPopup    = true
 	)
-	//用户是否需要留资
-	if menu.CapitalCode != "" {
-		capitalBool = false
-		for _, cv := range strings.Split(menu.CapitalCode, ",") {
-			if userInfo.Capitals[cv] == 0 {
-				if c := BaseMysql.CountBySql(`SELECT COUNT(id) FROM `+CapitalRetention+` WHERE  source = ? AND user_id = ? AND appid = ?`, cv, baseUserId, appId); c > 0 {
-					userInfo.Capitals[cv] = 1
+	//无权限（医械通-：1：免费用户；2：超级订阅、大会员到期时间不在规定范围内）
+	if !b {
+		//配置弹窗信息
+		if ConfigJson.DefaultPopup[menu.PowerIds].Title != "" {
+			customPopup = false
+			title = ConfigJson.DefaultPopup[menu.PowerIds].Title
+			content = ConfigJson.DefaultPopup[menu.PowerIds].Content
+			confirmUrl = ConfigJson.DefaultPopup[menu.PowerIds].ConfirmUrl
+			confirmText = ConfigJson.DefaultPopup[menu.PowerIds].ConfirmText
+			isShowCancel = ConfigJson.DefaultPopup[menu.PowerIds].IsShowCancel
+			appType = ConfigJson.DefaultPopup[menu.PowerIds].AppType
+			openType = ConfigJson.DefaultPopup[menu.PowerIds].OpenType
+		}
+	} else {
+		//大会员超级订阅用户 才有权限去验证是否有医疗权限
+		//用户是否需要留资
+		if menu.CapitalCode != "" {
+			capitalBool = false
+			for _, cv := range strings.Split(menu.CapitalCode, ",") {
+				if userInfo.Capitals[cv] == 0 {
+					if c := BaseMysql.CountBySql(`SELECT COUNT(id) FROM `+CapitalRetention+` WHERE  source = ? AND user_id = ? AND appid = ?`, cv, baseUserId, appId); c > 0 {
+						userInfo.Capitals[cv] = 1
+					} else {
+						userInfo.Capitals[cv] = -1
+					}
+				}
+				if userInfo.Capitals[cv] < 0 {
+					customPopup = false
+					//留资弹窗信息
+					title = menu.CapitalInfo.Title
+					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 {
-					userInfo.Capitals[cv] = -1
+					capitalBool = true
+					break
 				}
 			}
-			if userInfo.Capitals[cv] < 0 {
-				//留资弹窗信息
-				title = menu.CapitalInfo.Title
-				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 {
-				//自定义弹窗
-				title = menu.AdditionalInfo.Title
-				content = menu.AdditionalInfo.Content
-				confirmUrl = menu.AdditionalInfo.ConfirmUrl
-				confirmText = menu.AdditionalInfo.ConfirmText
-				isShowCancel = menu.AdditionalInfo.IsShowCancel
-				appType = menu.AdditionalInfo.AppType
-				openType = menu.AdditionalInfo.OpenType
-				capitalBool = true
-				break
-			}
+		} else {
+			capitalBool = true
 		}
-	} else {
-		capitalBool = true
-	}
-	//大会员超级订阅用户 才有权限去验证是否有医疗权限
-	if b {
 		//资源中台--- 无权限弹窗信息为默认信息（先留资）
 		if menu.PermissionCode != "" {
 			permissionBool = false
@@ -295,18 +302,10 @@ func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUse
 							}
 						}
 					}
-					if userInfo.Permissions[pv] < 0 {
-						//自定义弹窗
-						title = menu.AdditionalInfo.Title
-						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 {
+					if userInfo.Permissions[pv] >= 0 {
 						title = ""
 						permissionBool = true
+						customPopup = false
 						break
 					}
 				}
@@ -316,5 +315,15 @@ func CheckCapitalResources(menu *JYMenu, baseUserId, appId string, entId, entUse
 		}
 	}
 	usable = capitalBool && permissionBool
+	//自定义弹窗
+	if customPopup && !usable {
+		title = menu.AdditionalInfo.Title
+		content = menu.AdditionalInfo.Content
+		confirmUrl = menu.AdditionalInfo.ConfirmUrl
+		confirmText = menu.AdditionalInfo.ConfirmText
+		isShowCancel = menu.AdditionalInfo.IsShowCancel
+		appType = menu.AdditionalInfo.AppType
+		openType = menu.AdditionalInfo.OpenType
+	}
 	return
 }

entity/workDesktop.go

@@ -75,6 +75,9 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 	//logx.Info("树的长度：", len(m.MenuTree))
 	menuList := make([]*pb.MenuList, 0)
 	for _, mv := range m.MenuTree {
+		if mv.Id < 466 {
+			continue
+		}
 		//0：默认展示；1：需验证权限，有权限展示；2：需验证权限，无权限也可展示（可用服务无权限不展示）
 		usable := m.VerifyPermissions(mv.PowerIds)
 		//checkCode==1 验证权限结果 无权限不显示
@@ -144,6 +147,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 							continue
 						}
 						var (
+							//数据库默认提示弹窗信息
 							title, content, confirmUrl, confirmText, isShowCancel, appType, openType, feasibility = tv.AdditionalInfo.Title, tv.AdditionalInfo.Content, tv.AdditionalInfo.ConfirmUrl, tv.AdditionalInfo.ConfirmText, tv.AdditionalInfo.IsShowCancel, tv.AdditionalInfo.AppType, tv.AdditionalInfo.OpenType, usable
 						)
 						//三级菜单------