From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index 105b1df..f1e91cf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -248,10 +248,11 @@
 		if ("2".equalsIgnoreCase(ios)) {
 			down = DOWNURL;
 		}
-		if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+		if (state == null || !state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
 			// request.setAttribute("error", "1");
 			return "redirect:" + down;
 		}
+		
 		if (code == null) {// 鐢ㄦ埛鍙栨秷浜嗙櫥闄嗭紒
 			return "redirect:" + down;
 		}

--
Gitblit v1.8.0