feat:匹配大会员

entity/user.go

@@ -77,7 +77,7 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 				userId := userId
 				if memberStatus > 0 {
 					isFree = false
-					UserPowerMap["1"] = memberStatus
+					UserPowerMap["0"] = memberStatus
 					//是否是子账号 而且 子账号被启用
 					if (*data)["s_member_mainid"] != nil && MC.ObjToString((*data)["s_member_mainid"]) != "" && MC.IntAllDef((*data)["i_member_sub_status"], 0) > 0 {
 						userId = MC.ObjToString((*data)["s_member_mainid"])
@@ -87,7 +87,7 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 				serviceList := Mysql.Find(BigMemberUserPowerTable, map[string]interface{}{"s_userid": userId, "i_status": 0}, "DISTINCT(s_serviceid),i_frequency", "", -1, -1)
 				if serviceList != nil && len(*serviceList) != 0 {
 					for _, sv := range *serviceList {
-						UserPowerMap[MC.ObjToString(sv["s_serviceid"])] = MC.IntAll(sv["i_frequency"])
+						UserPowerMap[MC.ObjToString(sv["s_serviceid"])] = MC.If(MC.IntAll(sv["i_frequency"]) > 0, MC.IntAll(sv["i_frequency"]), memberStatus).(int)
 					}
 				}
 			}

entity/workDesktop.go

@@ -104,7 +104,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 				AppType:      mv.AppType,
 				OpenType:     mv.OpenType,
 			},
-			Match: strings.Split(mv.Match, ","),
+			Match: MC.If(mv.Match != "", strings.Split(mv.Match, ","), []string{}).([]string),
 		}
 		if len(mv.Children) > 0 {
 			for _, sv := range mv.Children {
@@ -132,7 +132,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 						AppType:      sv.AppType,
 						OpenType:     sv.OpenType,
 					},
-					Match: strings.Split(mv.Match, ","),
+					Match: MC.If(sv.Match != "", strings.Split(sv.Match, ","), []string{}).([]string),
 				}
 				if len(sv.Children) > 0 {
 					for _, tv := range sv.Children {
@@ -159,7 +159,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 								AppType:      tv.AppType,
 								OpenType:     tv.OpenType,
 							},
-							Match: strings.Split(mv.Match, ","),
+							Match: MC.If(tv.Match != "", strings.Split(tv.Match, ","), []string{}).([]string),
 						}
 						if len(tv.Children) > 0 {
 						L:
@@ -182,7 +182,7 @@ func (m *WorkDesktopMenu) WorkMenuFormat() ([]*pb.MenuList, error) {
 										OpenType:     fv.OpenType,
 									}
 								}
-								threeLevel.Match = strings.Split(fv.Match, ",")
+								threeLevel.Match = MC.If(fv.Match != "", strings.Split(fv.Match, ","), []string{}).([]string)
 								//四级菜单必须有顺序性，大会员》商机管理》超级订阅》免费用户
 								name := MC.If(strings.Contains(fv.Name, "-"), strings.Split(fv.Name, "-")[0], "免费").(string)
 								if len(UserRolePowers[name]) > 0 && m.VerifyPermissions(strings.Join(UserRolePowers[name], ",")) {
@@ -298,7 +298,7 @@ func (m *WorkDesktopMenu) CommonlyFormat(childMenus map[int][]*JYMenu) ([]*pb.Th
 				AppType:      mv.AppType,
 				OpenType:     mv.OpenType,
 			},
-			Match: strings.Split(mv.Match, ","),
+			Match: MC.If(mv.Match != "", strings.Split(mv.Match, ","), []string{}).([]string),
 		}
 		//处理子级
 		if childMenus[mv.Id] != nil && len(childMenus[mv.Id]) > 0 {
@@ -326,7 +326,7 @@ func (m *WorkDesktopMenu) CommonlyFormat(childMenus map[int][]*JYMenu) ([]*pb.Th
 						OpenType:     cv.OpenType,
 					}
 				}
-				oneLevel.Match = strings.Split(cv.Match, ",")
+				oneLevel.Match = MC.If(cv.Match != "", strings.Split(cv.Match, ","), []string{}).([]string)
 				name := MC.If(strings.Contains(cv.Name, "-"), strings.Split(cv.Name, "-")[0], "免费").(string)
 				if len(UserRolePowers[name]) > 0 && m.VerifyPermissions(strings.Join(UserRolePowers[name], ",")) {
 					break L