wangliang 2 лет назад
Родитель
Сommit
2f78c263ab

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/OpenApiController.java

@@ -174,7 +174,7 @@ public class OpenApiController {
         Optional.ofNullable(sysUser).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户不存在"));
         Optional.ofNullable(sysUser).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户不存在"));
 
 
         LoginResult loginResult = teachcloudCommonService.login(sysUser.getPassword(), sysUser, AppSourceEnum.CAS_THIRD);
         LoginResult loginResult = teachcloudCommonService.login(sysUser.getPassword(), sysUser, AppSourceEnum.CAS_THIRD);
-        if (Objects.isNull(returnUrl) || Objects.equals(returnUrl, "")) {
+        if (Objects.nonNull(returnUrl) && !Objects.equals(returnUrl, "")) {
             returnUrl = URLDecoder.decode(returnUrl, SystemConstant.CHARSET_NAME);
             returnUrl = URLDecoder.decode(returnUrl, SystemConstant.CHARSET_NAME);
         }
         }
         loginResult.setReturnUrl(returnUrl);
         loginResult.setReturnUrl(returnUrl);