Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

81041

2018-12-26 94c3b603ae4fd3f26e23a33e3eabc781d9c08846

 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);