范围内地区调整

src/jfw/modules/publicapply/src/subscribePush/entity/setting.go

@@ -129,14 +129,22 @@ func IsCanSet(userId string, areamap map[string]interface{}) (bool, bool, int) {
 		areacount = qutil.IntAll(o_buyset_p["areacount"]) //-1 全国无限制
 		myareamap = *qutil.ObjToMap(o_jy["o_area_p"])
 	}
+	myareabool := map[string]bool{}
+	areasize := 0
+	//库中地区
 	for oak, _ := range myareamap {
+		myareabool[oak] = true
 		myarea = append(myarea, oak)
 	}
+	//参数地区
 	for sak, _ := range areamap {
+		if myareabool[sak] {
+			areasize += 1
+		}
 		setarea = append(setarea, sak)
 	}
-	if areaSort(setarea) == areaSort(myarea) {
-		log.Println(setarea, "-地区选择前后一致-", myarea)
+	if areaSort(setarea) == areaSort(myarea) || areasize == len(setarea) {
+		log.Println(setarea, "-地区选择前后一致或地区调整在已选择地区范围内-", myarea)
 		return true, qutil.IntAll(o_jy["i_ppstatus"]) > 0, areacount
 	}
 	// log.Println(areaSort(setarea) == areaSort(myarea), "---areacount:", areacount)