From 94c3b603ae4fd3f26e23a33e3eabc781d9c08846 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 11:33:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/services/User_infService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/User_infService.java b/gx_tieta/src/com/fgkj/services/User_infService.java
index a142470..7a96d90 100644
--- a/gx_tieta/src/com/fgkj/services/User_infService.java
+++ b/gx_tieta/src/com/fgkj/services/User_infService.java
@@ -273,10 +273,15 @@
 			if (user != null && login_time != null) {
 				UserClient client = map.get(user.getUName());
 				if (client != null) {
-					if (login_time != client.getLogin_times()) {
+					if (login_time == client.getLogin_times()) {
+						model.setCode(0);
+					}else {
 						model.setCode(1);
 						model.setMsg(getText("The landing on the account in another host, please log in again"));
 					}
+				}else {
+					model.setCode(1);
+					model.setMsg(getText("You are not logged in, please log in"));
 				}
 			} else {
 				model.setCode(1);

--
Gitblit v1.9.1