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

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -135,18 +135,17 @@ WHERE`
 	if eStatus == 1 && len(ruleIds) == 0 {
 		return 0, nil
 	} else if eStatus != 0 && len(ruleIds) > 0 {
-		tStr := ``
-		for i, v := range ruleIds {
-			if i != 0 {
-				tStr += `,`
-			}
-			tStr += fmt.Sprintf(`"%s"`, v)
-		}
-
 		if eStatus == 1 { //有个人订阅
+			tStr := ``
+			for i, v := range ruleIds {
+				if i != 0 {
+					tStr += `,`
+				}
+				tStr += fmt.Sprintf(`"%s"`, v)
+			}
 			queryArr = append(queryArr, fmt.Sprintf(` rule_id in ( %s ) `, tStr))
 		} else if eStatus == -1 { //无个人订阅
-			queryArr = append(queryArr, fmt.Sprintf(` rule_id not in ( %s ) `, tStr))
+			queryArr = append(queryArr, ` rule_id is NULL `)
 		}
 	}
 	// 个人订阅过滤