Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

 import java.util.List;
 import java.util.Set;
 
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
 import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
     private SysPermissionService permissionService;
     @Autowired
     IdentityAuthenticationService identityAuthenticationService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 登录方法
         String status = identityAuthenticationService.checkIsAuthentication(identityAuthentication);
 
         ajax.put("certificationStatus", status);
-        ajax.put("userId", SecurityUtils.getUserId());
-        ajax.put("userName", SecurityUtils.getUsername());
+        // 获取用户信息
+        SysUser sysUser = sysUserService.selectUserByUserName(loginBody.getUsername());
+        ajax.put("userId", sysUser!=null?sysUser.getUserId():"");
+        ajax.put("userName", sysUser!=null?sysUser.getUserName():"");
         return ajax;
     }