fix: 完成时状态与超时判断区分任务组

陈昶聿

6 天以前 599beddc80e7e50b2099bacdbf7df2d89df00ef2

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

@@ -82,7 +82,7 @@
        // 生成令牌
        if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
            //通用密码：Hrs#当前年月日*
            token = loginService.getTokenWN(loginBody.getUsername());
            token = loginService.getTokenWN(loginBody.getUsername(), loginBody.getCampusid());
        } else {
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid(), loginBody.getUserType());
        }
@@ -137,14 +137,6 @@
        if (StringUtils.isEmpty(systype)) path = sysConfigService.selectConfigByKey("sys.qddz");
        else path = sysConfigService.selectConfigByKey("sys.qddz.yd");

        if (active.equals("nhfy")){
            //南华附一的，先不走免登，直接跳到登陆页
            path = sysConfigService.selectConfigByKey("sys.qddz.yd");
            log.info("【NHFYSSO登录】重定向地址：{}", path);
            return buildRedirect(path);
        }
            log.info("qddz的查询值为，path：{}", path);

        if (StringUtils.isEmpty(path)) {
            throw new BaseException("请配置前端地址");
        }
@@ -155,7 +147,11 @@
            return buildRedirect(path + "/login");
        }

        String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
        String redirectUrl = path + "/#/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
        if (active.equals("sltd")) {
            //省立同德不能带“#”
            redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
        }
        log.info("【SSO登录】重定向地址：{}", redirectUrl);
        return buildRedirect(redirectUrl);
    }
@@ -229,7 +225,7 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        //显示所有院区权限
        String allCampus = sysConfigService.selectConfigByKey("sys.authority.campus.all");
        if(StringUtils.isNotEmpty(allCampus)){
        if (StringUtils.isNotEmpty(allCampus)) {
            allCampus = "," + allCampus + ",";
            if (allCampus.contains("," + user.getUserName() + ",")) {
                user.setCampusid(null);