wip:提交

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

@@ -18,6 +18,7 @@ func FreeIsInTsGuide(userid string, changeType int) int {
 		i_ts_guide = gconv.Int64((*data)["i_ts_guide"])
 		a_key      = gconv.Interfaces(o_jy["a_key"])
 		o_area     = gconv.Map(o_jy["o_area"])
+		o_area_p   = gconv.Map(o_jy["o_area_p"])
 	)
 	//fmt.Printf("FreeIsInTsGuide %v  \ni_ts_guide:%v \n len(o_jy) == 0:%v\n a_key == nil || len(a_key) == 0 :%v\n o_area == nil || len(o_area) == 0: %v", userid, i_ts_guide, len(o_jy) == 0, a_key == nil || len(a_key) == 0, o_area == nil || len(o_area) == 0)
 	if i_ts_guide == 1 {
@@ -29,7 +30,7 @@ func FreeIsInTsGuide(userid string, changeType int) int {
 	if (a_key == nil || len(a_key) == 0) && changeType != 1 {
 		return 2
 	}
-	if (o_area == nil || len(o_area) == 0) && changeType != 2 {
+	if ((o_area == nil || len(o_area) == 0) || (o_area_p == nil) || len(o_area_p) == 0) && changeType != 2 {
 		return 2
 	}
 	return 1