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

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -68,6 +68,8 @@ func GetStaffSubscribeList(entId, entUserId int, query string, eStatus, pStatus,
 	allRule := ""
 	if len(ruleIds) > 0 {
 		allRule = " AND b.rule_id in ('" + strings.Join(ruleIds, "','") + "')"
+	} else {
+		allRule = " AND b.rule_id is NULL "
 	}
 
 	var sql string = ` FROM (