1.#3556 外部交易所过滤条件问题

2.其它注释

models/ermcp3.go

@@ -2551,6 +2551,7 @@ func (r *XHDeliveryGoods) addBrandlst(lstBrand []XHBRAND) {
 //filterSubEmpty 层层递进过滤期货合约列表为空的品种、品类
 func (r *XHDeliveryGoods) filterSubEmpty(sData []XHDeliveryGoods) []XHDeliveryGoods {
 
+	//返回有商品的商品组
 	fGp := func(lst []TBGoodsGroup) []TBGoodsGroup {
 		tmp := make([]TBGoodsGroup, 0)
 		for i := range lst {
@@ -2561,6 +2562,7 @@ func (r *XHDeliveryGoods) filterSubEmpty(sData []XHDeliveryGoods) []XHDeliveryGo
 		return tmp
 	}
 
+	//返回有关联商品组的套保品
 	fMg := func(lst []XHMiddleGoods) []XHMiddleGoods {
 		tmp := make([]XHMiddleGoods, 0)
 		for i := range lst {
@@ -2574,6 +2576,7 @@ func (r *XHDeliveryGoods) filterSubEmpty(sData []XHDeliveryGoods) []XHDeliveryGo
 		return tmp
 	}
 
+	//返回有关联套保品的品类
 	fWd := func(lst []XHWrstandard) []XHWrstandard {
 		tmp := make([]XHWrstandard, 0)
 		for i := range lst {
@@ -2590,6 +2593,7 @@ func (r *XHDeliveryGoods) filterSubEmpty(sData []XHDeliveryGoods) []XHDeliveryGo
 	for i := range sData {
 		sData[i].WDLST = fWd(sData[i].WDLST)
 	}
+	//保存有品类的品种
 	tmp := make([]XHDeliveryGoods, 0)
 	for i := range sData {
 		if len(sData[i].WDLST) > 0 {

models/market.go

@@ -480,11 +480,14 @@ func GetAllExExchanges() ([]Externalexchange, error) {
 func GetAvalidExchangeId(userId int64) []int64 {
 	e := db.GetEngine()
 	sqlId := `
-	select g.exexchangeid
-	  from erms_middlegoods t
-	  left join goodsgroup g
-		on t.goodsgroupid = g.goodsgroupid
-	 where t.areauserid = %v
+	select t.exexchangeid
+  from goodsgroup t
+ where t.groupcategroyid in
+       (select g.groupcategroyid
+          from erms_middlegoods m
+          left join goodsgroup g
+            on m.goodsgroupid = g.goodsgroupid
+         where m.areauserid = %v)
 `
 	sqlId = fmt.Sprintf(sqlId, userId)
 	type ExchangeId struct {