修改同步接口

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

@@ -1,48 +1,40 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.*;
-
-import cn.hutool.core.util.IdUtil;
 import com.ruoyi.biemo.business.domain.ZYUserInfo;
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.web.service.SysLoginService;
+import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.web.config.exception.UnAuthorizedException;
 import com.ruoyi.web.config.security.JwtUser;
 import com.ruoyi.web.config.security.LoginResult;
 import com.ruoyi.web.config.security.TokenProvider;
-import com.ruoyi.web.util.RsaUtil;
 import com.ruoyi.web.util.TzApi;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
-import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 /**
  * 登录验证
@@ -147,6 +139,7 @@ public class SysLoginController {
 
 
     //todo 多加一个deptId
+
     /**
      * 获取用户信息
      *
@@ -213,7 +206,14 @@ public class SysLoginController {
             //填充用户信息
             SysUser stuUser = new SysUser();
             stuUser.setUserId(userId); //使用智云的
+
+            //这里是老师用户，智云跳转没学校ID，设置成学校ID
+            if (classId == 0) {
+                System.out.println(classId);
+                stuUser.setDeptId(Long.valueOf(zyUserInfo.getSchoolId()));
+            } else {
                 stuUser.setDeptId(Long.valueOf(classId));
+            }
             stuUser.setUserName(username);
             stuUser.setNickName(name);
             stuUser.setPassword(password);