完善登录日志

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -369,6 +369,7 @@ public class UserService extends JedisUtil {
             result.setObj(userVo);
             //获取到用户信息后保存登录日志
             return getLogResultVo(user,result,"扫码登录",request);
+
         }else{
             result.setCode(1);
             result.setMsg("登录失败");
@@ -433,14 +434,15 @@ public class UserService extends JedisUtil {
     public void saveSyncLoginLog(TUserLog userLog, TUser user,UserVo userVo, HttpServletRequest request) {
         try {
 
-            userLog.setUserid(user.getUserid());
-            userLog.setUsername(user.getUsername());
-            userLog.setSchoolid(user.getSchoolid());
+            userLog.setUserid(userVo.getUserid());
+            userLog.setUsername(userVo.getUsername());
+            userLog.setSchoolid(userVo.getSchoolid());
+            userLog.setLoginname(userVo.getLoginname());
             userLog.setSystemversion(user.getSystemversion());
             userLog.setUltypeband(user.getUltypeband());
             userLog.setUltypemodel(user.getUltypemodel());
             userLog.setSystembit(user.getSystembit());
-            Integer usertype = user.getUsertype();
+            Integer usertype = userVo.getUsertype();
             userLog.setUsertype(usertype);
             String ultype = user.getUltype();
             if (N_Utils.isNotEmpty(ultype) && ultype.equals("p_web") && usertype != null) {