提交

liusheng

2 天以前 b57304d9917beab4671442a0018c1c3a2d681640

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

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;

import com.ruoyi.common.annotation.IpWhitelist;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -14,10 +15,11 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
import com.smartor.mapper.SysUserDeptMapper;
import com.ruoyi.system.mapper.SysUserDeptMapper;
import com.smartor.service.IServiceSLTDHealthcareRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.view.RedirectView;
@@ -54,6 +56,7 @@
    private IServiceSLTDHealthcareRecordService iServiceSLTDHealthcareRecordService;

    @Autowired
    @Qualifier("sysUserDeptSystemMapper")
    private SysUserDeptMapper sysUserDeptMapper;

    /**
@@ -97,12 +100,12 @@
     */
//    @IpWhitelist
    @GetMapping("/SSOLogin")
    public RedirectView SSOLogin(@RequestParam(required = false) String userName,
                                 @RequestParam(required = false) String orgid,
                                 @RequestParam(required = false) String campusid,
    public RedirectView SSOLogin(@RequestParam(required = false) String campusid,
                                 @RequestParam(required = false) String deptId,
                                 String orgid,
                                 String userName,
                                 String token) {
        if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
        if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
            throw new BaseException("参数不能为空");
        }