Merge branch 'dev/v1.1.19_wky' of BaseService/jyMicroservices into feature/v1.1.19

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -38,6 +38,14 @@ func (p *PersonSubscribe) IsEmpty() bool {
 	if len(p.AItems) > 0 || len(p.AInfotype) > 0 || len(p.ABuyerclass) > 0 || len(p.OArea) > 0 {
 		return false
 	}
+	// 遍历订阅词
+	for _, item := range p.AItems {
+		for _, key := range item.AKey {
+			if len(key.Key) > 0 || len(key.Notkey) > 0 {
+				return false
+			}
+		}
+	}
 	return true
 }
 
@@ -201,7 +209,7 @@ func GetStaffSubscribeDetail(entId, uid int64, token string) (rData map[string]i
 		return
 	}
 	rData = map[string]interface{}{}
-	for _, vipFlag := range strings.Split(power, ",") {
+	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 {