|
|
@@ -320,8 +320,8 @@ func getConfiguration(conditionName, conditionType string, entId int64, position
|
|
|
and a.is_delete = 0
|
|
|
AND a.element_name = ?
|
|
|
and FIND_IN_SET( b.code,a.element_value)
|
|
|
- left join d_yys_dimensions_order c on b.name=c.name and b.type= c.type and b.type=?
|
|
|
- order by c.id,b.code`, positionId, entId, conditionName, filedType)
|
|
|
+ left join d_yys_dimensions_order c on b.type=? and b.name=c.name and b.type= c.type and b.type=?
|
|
|
+ where b.type=? order by c.id,b.code`, positionId, entId, conditionName, filedType, filedType)
|
|
|
} else {
|
|
|
if conditionType == "winner_tag" {
|
|
|
filedType = "3"
|
|
|
@@ -339,8 +339,8 @@ func getConfiguration(conditionName, conditionType string, entId int64, position
|
|
|
and a.is_delete = 0
|
|
|
AND a.element_name = ?
|
|
|
and FIND_IN_SET( b.code,a.element_value)
|
|
|
- left join d_yys_dimensions_order c on b.name=c.name and b.type= c.type and b.type=?
|
|
|
- order by c.id,b.code `, positionId, entId, conditionName, filedType)
|
|
|
+ left join d_yys_dimensions_order c on b.type=? and b.name=c.name and b.type= c.type
|
|
|
+ where b.type=? order by c.id,b.code `, positionId, entId, conditionName, filedType, filedType)
|
|
|
}
|
|
|
|
|
|
options := []map[string]interface{}{}
|
|
|
@@ -353,9 +353,11 @@ func getConfiguration(conditionName, conditionType string, entId int64, position
|
|
|
DISTINCT a.name,a.code
|
|
|
FROM
|
|
|
d_yys_analyze_dimensions a
|
|
|
- left join d_yys_dimensions_order b on a.name=b.name and a.type=b.type and
|
|
|
- a.ent_id = ?
|
|
|
- and a.type=? order by b.id,a.code`, entId, filedType)
|
|
|
+ left join d_yys_dimensions_order b on a.ent_id = ?
|
|
|
+ and a.type=? and a.name=b.name and a.type=b.type
|
|
|
+ where a.ent_id = ?
|
|
|
+ and a.type=?
|
|
|
+ order by b.id,a.code`, entId, filedType, entId, filedType)
|
|
|
} else {
|
|
|
data = IC.BiMysql.SelectBySql(`SELECT
|
|
|
DISTINCT a.name,a.code
|
WH01243