wip:修改订阅产品名字

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -209,19 +209,32 @@ func GetStaffSubscribeDetail(entId, uid int64, token string) (rData map[string]i
 		return
 	}
 	rData = map[string]interface{}{}
-	for _, vipFlag := range strings.Split(power, "_") {
-		if vipFlag == "e" {
-			//个人订阅商机管理
-			if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 0}); data != nil && len(data) > 0 {
-				rData["个人订阅<br>商机管理"] = data
-			}
-		} else if vipFlag == "v" || vipFlag == "m" {
-			//大会员或超级订阅企业版
-			if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 1}); data != nil && len(data) > 0 {
-				rData[fmt.Sprintf("个人订阅<br>%s", common.If(vipFlag == "v", "超级订阅企业版", "大会员企业版"))] = data
-			}
+	nameEntNiche, nameVipMember := "", "" //当只存在大会员或商机管理时 展示个人订阅；当都存在时展示产品信息
+	valueEntNiche, valueVipMember := map[string]interface{}{}, map[string]interface{}{}
+
+	if strings.Index(power, "e") > -1 {
+		//个人订阅商机管理
+		if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 0}); data != nil && len(data) > 0 {
+			nameEntNiche = "个人订阅<br>商机管理"
+			valueEntNiche = data
+		}
+	} else if strings.Index(power, "m") > -1 || strings.Index(power, "v") > -1 {
+		//大会员或超级订阅企业版
+		if data := getPersonSubscribe(map[string]interface{}{"i_entid": entId, "i_userid": staffId, "i_type": 1}); data != nil && len(data) > 0 {
+			nameVipMember = fmt.Sprintf("个人订阅<br>%s", common.If(strings.Index(power, "v") > -1, "超级订阅企业版", "大会员企业版"))
+			valueVipMember = data
 		}
 	}
+
+	if len(valueEntNiche) > 0 && len(valueVipMember) > 0 {
+		rData[nameEntNiche] = valueEntNiche
+		rData[nameVipMember] = valueVipMember
+	} else if len(valueEntNiche) > 0 {
+		rData["个人订阅"] = valueEntNiche
+	} else if len(valueVipMember) > 0 {
+		rData["个人订阅"] = valueVipMember
+	}
+
 	// 企业自动分发
 	if ruleId != "" {
 		if data := getEntDistribute(ruleId, entId, staffId); data != nil && len(data) > 0 {