|
@@ -267,54 +267,60 @@ func SearchListFormat(userid, subInformation, propertyForm, industry string, rep
|
|
if bidField == "BIProperty" {
|
|
if bidField == "BIProperty" {
|
|
searchList.FileExists = false
|
|
searchList.FileExists = false
|
|
//物业数据处理
|
|
//物业数据处理
|
|
- searchList.Bi.TagTopInformation = gconv.SliceStr(v["tag_topinformation"])
|
|
|
|
- subinformationArr := gconv.SliceStr(v["tag_subinformation"])
|
|
|
|
- if len(subinformationArr) > 0 {
|
|
|
|
- if len(subInformation) > 0 {
|
|
|
|
- fool := false
|
|
|
|
- for _, s1 := range subinformationArr {
|
|
|
|
- for _, s2 := range strings.Split(subInformation, ",") {
|
|
|
|
- if s2 == s1 {
|
|
|
|
- searchList.Bi.TagSubInformation = strings.Split(s1, "_")[1]
|
|
|
|
- fool = true
|
|
|
|
|
|
+ if v["tag_topinformation"] != nil {
|
|
|
|
+ searchList.Bi.TagTopInformation = gconv.SliceStr(v["tag_topinformation"])
|
|
|
|
+ }
|
|
|
|
+ if v["tag_subinformation"] != nil {
|
|
|
|
+ subinformationArr := gconv.SliceStr(v["tag_subinformation"])
|
|
|
|
+ if len(subinformationArr) > 0 {
|
|
|
|
+ if len(subInformation) > 0 {
|
|
|
|
+ fool := false
|
|
|
|
+ for _, s1 := range subinformationArr {
|
|
|
|
+ for _, s2 := range strings.Split(subInformation, ",") {
|
|
|
|
+ if s2 == s1 {
|
|
|
|
+ searchList.Bi.TagSubInformation = strings.Split(s1, "_")[1]
|
|
|
|
+ fool = true
|
|
|
|
+ break
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if fool {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if fool {
|
|
|
|
- break
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ searchList.Bi.TagSubInformation = strings.Split(subinformationArr[0], "_")[1]
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- searchList.Bi.TagSubInformation = strings.Split(subinformationArr[0], "_")[1]
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//是否有附件
|
|
//是否有附件
|
|
- tag := gconv.Map(v["tag_set"])
|
|
|
|
- if tag != nil {
|
|
|
|
- wuye := gconv.Map(tag["wuye"])
|
|
|
|
- if tag != nil {
|
|
|
|
- isFile := gconv.Int64(wuye["isfile"])
|
|
|
|
- propertyFormStr := gconv.String(wuye["property_form"])
|
|
|
|
- if isFile == 63 {
|
|
|
|
- searchList.FileExists = true
|
|
|
|
- }
|
|
|
|
- if propertyFormStr != "" {
|
|
|
|
- if propertyForm != "" {
|
|
|
|
- fool := false
|
|
|
|
- for _, s1 := range strings.Split(propertyFormStr, ",") {
|
|
|
|
- for _, s2 := range strings.Split(propertyForm, ",") {
|
|
|
|
- if s2 == s1 {
|
|
|
|
- searchList.Bi.PropertyForm = s2
|
|
|
|
- fool = true
|
|
|
|
|
|
+ if v["tag_set"] != nil {
|
|
|
|
+ tag := gconv.Map(v["tag_set"])
|
|
|
|
+ if tag != nil && tag["wuye"] != nil {
|
|
|
|
+ wuye := gconv.Map(tag["wuye"])
|
|
|
|
+ if wuye != nil {
|
|
|
|
+ isFile := gconv.Int64(wuye["isfile"])
|
|
|
|
+ propertyFormStr := gconv.String(wuye["property_form"])
|
|
|
|
+ if isFile == 63 {
|
|
|
|
+ searchList.FileExists = true
|
|
|
|
+ }
|
|
|
|
+ if propertyFormStr != "" {
|
|
|
|
+ if propertyForm != "" {
|
|
|
|
+ fool := false
|
|
|
|
+ for _, s1 := range strings.Split(propertyFormStr, ",") {
|
|
|
|
+ for _, s2 := range strings.Split(propertyForm, ",") {
|
|
|
|
+ if s2 == s1 {
|
|
|
|
+ searchList.Bi.PropertyForm = s2
|
|
|
|
+ fool = true
|
|
|
|
+ break
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if fool {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if fool {
|
|
|
|
- break
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ searchList.Bi.PropertyForm = strings.Split(propertyFormStr, ",")[0]
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- searchList.Bi.PropertyForm = strings.Split(propertyFormStr, ",")[0]
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|