Merge remote-tracking branch 'origin/master'

陈昶聿

4 天以前 2cfa20c70ea84fa3435f3fd1e653c5ae60a3fc1e

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

@@ -151,7 +151,7 @@
            RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
            userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
        }

        if (StringUtils.isEmpty(deptId)) deptId = "null";
        String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
        if (StringUtils.isEmpty(token2)) {
            throw new BaseException("登陆失败");