|
|
@@ -122,7 +122,7 @@ func getGetCriteriaType(entId, positionId, tag int64) []map[string]interface{} {
|
|
|
configName := gconv.String(v["config_name"])
|
|
|
switch configName {
|
|
|
case "行业":
|
|
|
- industryArr, _ := getConfiguration("行业", "industry", entId)
|
|
|
+ industryArr, _ := getConfiguration("行业", "industry", entId, positionId)
|
|
|
if len(industryArr) > 0 {
|
|
|
data = append(data, map[string]interface{}{
|
|
|
"key": "industry",
|
|
|
@@ -137,7 +137,7 @@ func getGetCriteriaType(entId, positionId, tag int64) []map[string]interface{} {
|
|
|
}
|
|
|
|
|
|
case "中标人标签":
|
|
|
- winnerArr, _ := getConfiguration("运营商中标标签", "winner_tag", entId)
|
|
|
+ winnerArr, _ := getConfiguration("运营商中标标签", "winner_tag", entId, positionId)
|
|
|
if len(winnerArr) > 0 {
|
|
|
data = append(data, map[string]interface{}{
|
|
|
"key": "winnerTag",
|
|
|
@@ -860,8 +860,8 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
|
|
|
data = IC.BiMysql.SelectBySql(sqlStr,
|
|
|
idArr...)
|
|
|
if data != nil && len(*data) > 0 {
|
|
|
- _, winnerMap := getConfiguration("运营商中标标签", "winner_tag", operator.EntId)
|
|
|
- _, industryMap := getConfiguration("行业", "industry", operator.EntId)
|
|
|
+ _, winnerMap := getConfiguration("运营商中标标签", "winner_tag", operator.EntId, operator.PositionId)
|
|
|
+ _, industryMap := getConfiguration("行业", "industry", operator.EntId, operator.PositionId)
|
|
|
fileArr := &[]map[string]interface{}{}
|
|
|
if operator.Tag == 0 {
|
|
|
fileArr = IC.BiMysql.SelectBySql("select * from field_order ")
|
|
|
@@ -881,7 +881,7 @@ func SearchList(operator Operator) (int64, *[]map[string]interface{}, int64) {
|
|
|
key := gconv.String(m["file"])
|
|
|
newData[key] = v[key]
|
|
|
}
|
|
|
- v["infoid"] = ME.EncodeArticleId2ByCheck(gconv.String(v["infoid"]))
|
|
|
+ newData["infoid"] = ME.EncodeArticleId2ByCheck(gconv.String(v["infoid"]))
|
|
|
(*data)[i] = newData
|
|
|
}
|
|
|
}
|
WH01243