Merge branch 'dev/v4.8.94_dx' of qmx/jy into feature/v4.8.94

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -799,23 +799,19 @@ func getSqlObjFromId(o_member_jy map[string]interface{}, area string) *util.View
 					areaArr = append(areaArr, s)
 					continue
 				}
-				if len(i) == 0 { //未选城市 订阅城市不为空
+				if len(i) == 0 { //未选城市 订阅城市不为空 默认为订阅的城市 对应的区县
 					for _, i3 := range o_area[s].([]interface{}) {
-						i[qutil.ObjToString(i3)] = nil
+						city := qutil.InterfaceToStr(i3)
+						i[city] = o_district[city]
 					}
 				}
 				for s2, is2 := range i {
 					i2, _ := is2.([]interface{})
-					//未选区县 订阅区县也为空
-					if vs, ok := o_district[s2]; (!ok || vs == nil || len(vs.([]interface{})) == 0) && len(i2) == 0 {
+					//订阅区县为空
+					if len(i2) == 0 {
 						cityArr = append(cityArr, s2)
 						continue
 					}
-					if len(i2) == 0 { //未选区县市 订阅区县不为空
-						for _, i3 := range o_district[s2].([]interface{}) {
-							i2 = append(i2, qutil.InterfaceToStr(i3))
-						}
-					}
 					for _, s3 := range i2 {
 						districtArr = append(districtArr, fmt.Sprintf("%s_%s", s2, s3))
 					}