fix bug: #2064 #2084

models/ermcp3.go

@@ -149,7 +149,6 @@ func (r *Ermcp3Brand) GetData() ([]Ermcp3Brand, error) {
 	m := ErmcpDGFactoryItem{
 		DELIVERYGOODSID:     int32(r.DELIVERYGOODSID),
 		DGFACTORYITEMTYPEID: 2,
-		ORDERINDEX:          1,
 	}
 	sData := make([]Ermcp3Brand, 0)
 	if d, err := m.GetDataEx(); err == nil {
@@ -2135,19 +2134,16 @@ func (r *Ermcp3GoodsGroup) buildSql() string {
 		" WHERE 1 = 1" +
 		"   and m.trademode = 15"
 	if r.ExcludeCfg == 1 {
-		str := "select t.goodsgroupid" +
-			"  from ERMS_MiddleGoods t" +
-			" where t.isvalid=1 and t.areauserid = %v" +
-			" union all " +
+		str :=
 			"select goodsgroupid" +
-			"  from goodsgroup t" +
-			" where t.groupcategroyid not in" +
-			"       (select distinct g.groupcategroyid" +
-			"          from erms_middlegoods t" +
-			"          left join goodsgroup g" +
-			"            on t.goodsgroupid = g.goodsgroupid" +
-			"         where t.isvalid=1 and t.areauserid = %v)"
-		str = fmt.Sprintf(str, r.AreaUserId, r.AreaUserId)
+				"  from goodsgroup t" +
+				" where t.groupcategroyid not in" +
+				"       (select distinct g.groupcategroyid" +
+				"          from erms_middlegoods t" +
+				"          left join goodsgroup g" +
+				"            on t.goodsgroupid = g.goodsgroupid" +
+				"         where t.isvalid=1 and t.areauserid = %v)"
+		str = fmt.Sprintf(str, r.AreaUserId)
 		sqlId.Join(fmt.Sprintf(" and t.goodsgroupid in(%v)", str))
 	}
 	return sqlId.String()
@@ -2484,9 +2480,9 @@ type XHBRAND struct {
 func (r *XHBRAND) GetDataEx() (interface{}, error) {
 	sData := make([]XHBRAND, 0)
 	var sqlId utils.SQLVal = `
-SELECT DGFACTORYITEMID,
+SELECT DGFACTORYITEMID brandid,
         t.DELIVERYGOODSID,
-        to_char(t.DGFACTORYITEMTYPEID) brandid,
+        to_char(t.DGFACTORYITEMTYPEID) brandtypeid,
         t.DGFACTORYITEMVALUE brandname,
         to_char(t.WAREHOUSEID) WAREHOUSEID,
         t.ISVALID,
@@ -2496,7 +2492,6 @@ SELECT DGFACTORYITEMID,
    left join deliverygoods g
      on t.deliverygoodsid = g.deliverygoodsid
   WHERE t.dgfactoryitemtypeid = 2
-    and t.orderindex = 1
 `
 	sqlId.AndEx("g.areauserid", r.AREAUSERID, r.AREAUSERID > 0)
 	sqlId.AndEx("g.deliverygoodsid", r.DELIVERYGOODSID, r.DELIVERYGOODSID > 0)