Merge branch 'feature/v4.8.83_wky' of qmx/jy into feature/v4.8.83

src/jfw/front/dataExport.go

@@ -96,6 +96,15 @@ func (d *DataExport) ToSieve() error {
 }
 
 func (d *DataExport) SieveData() {
+	sessVal := d.Session().GetMultiple()
+	if util.ObjToString(sessVal["userId"]) == "" {
+		d.ServeJson(map[string]interface{}{
+			"error_code": -1,
+			"error_msg":  "请登录",
+		})
+		return
+	}
+
 	dataType := d.GetString("dataType")
 	publishtime := d.GetString("publishtime")
 	area := d.GetString("area")
@@ -257,7 +266,6 @@ func (d *DataExport) SieveData() {
 		"comeintime":  time.Now().Unix(),
 		"comeinfrom":  "exportPage",
 	}
-	sessVal := d.Session().GetMultiple()
 	if sessVal["s_m_openid"] != nil {
 		sieveCondition["s_openid"] = util.ObjToString(sessVal["s_m_openid"])
 	}

src/jfw/jyutil/sessionkeep.go

@@ -104,7 +104,7 @@ func (sk *SessionKeep) Do() bool {
 					http.Redirect(sk.W, sk.R, "/notin/page", 302)
 					return false
 				}
-			} else if (rqu != "/front/dataExport/toSieve" && strings.HasPrefix(rqu, "/front/dataExport")) || strings.HasPrefix(rqu, "/front/dataPack") {
+			} else if (rqu != "/front/dataExport/toSieve" && rqu != "/front/dataExport/sieveData" && strings.HasPrefix(rqu, "/front/dataExport")) || strings.HasPrefix(rqu, "/front/dataPack") {
 				//数据预览图片导出，需要去掉session拦截
 				sk.SetSession["referer"] = sk.R.RequestURI
 				http.Redirect(sk.W, sk.R, "/notin/page", 302)