From e770567b9b78e7a1519fb42345eef593b6925e41 Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Thu, 23 Feb 2023 13:36:55 +0800 Subject: [PATCH] =?UTF-8?q?OA=E6=9D=BF=E5=9D=97=E6=95=B4=E5=90=88=E4=B8=8E?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydool/common/advice/BaseControllerAdvice.java | 10 +++++----- .../com/ydool/oa/flow/service/FlowStepService.java | 2 +- .../ydool/oa/formily/controller/TreeController.java | 2 +- .../com/ydool/system/service/impl/AuthServiceImpl.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ydool/common/advice/BaseControllerAdvice.java b/src/main/java/com/ydool/common/advice/BaseControllerAdvice.java index ae33ae8..10b501d 100644 --- a/src/main/java/com/ydool/common/advice/BaseControllerAdvice.java +++ b/src/main/java/com/ydool/common/advice/BaseControllerAdvice.java @@ -75,19 +75,19 @@ public class BaseControllerAdvice { // 判断场景值，定制化异常信息 String message = ""; if(nle.getType().equals(NotLoginException.NOT_TOKEN)) { - message = "未提供token"; + message = "未登录,请登录"; } else if(nle.getType().equals(NotLoginException.INVALID_TOKEN)) { - message = "token无效"; + message = "登录无效,请重新登录"; } else if(nle.getType().equals(NotLoginException.TOKEN_TIMEOUT)) { - message = "token已过期"; + message = "登录已过期,请重新登录"; } else if(nle.getType().equals(NotLoginException.BE_REPLACED)) { - message = "token已被顶下线"; + message = "登录已被顶下线,请重新登录"; } else if(nle.getType().equals(NotLoginException.KICK_OUT)) { - message = "token已被踢下线"; + message = "登录已被踢下线,请重新登录"; } else { message = "当前会话未登录"; diff --git a/src/main/java/com/ydool/oa/flow/service/FlowStepService.java b/src/main/java/com/ydool/oa/flow/service/FlowStepService.java index 2c95b06..46ee417 100644 --- a/src/main/java/com/ydool/oa/flow/service/FlowStepService.java +++ b/src/main/java/com/ydool/oa/flow/service/FlowStepService.java @@ -42,7 +42,7 @@ public class FlowStepService extends BaseService { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(FlowStep.class).orderByDesc(FlowStep::getCreatedAt); if(isDone) qw.ne(FlowStep::getStatus, FlowConstant.FLOW_STATUS_DONE); else qw.eq(FlowStep::getStatus, FlowConstant.STEP_STATUS_ACTIVE); - qw.apply("FIND_IN_SET (" + currentUser.getId() + ", user_ids)"); + qw.apply("FIND_IN_SET ('" + currentUser.getId() + "', user_ids)"); PageResult pageResult = PageResultFactory.createPageResult(page(PageFactory.defaultPage(),qw)); return pageResult; } diff --git a/src/main/java/com/ydool/oa/formily/controller/TreeController.java b/src/main/java/com/ydool/oa/formily/controller/TreeController.java index 1b2dbf6..6a9e22a 100644 --- a/src/main/java/com/ydool/oa/formily/controller/TreeController.java +++ b/src/main/java/com/ydool/oa/formily/controller/TreeController.java @@ -15,7 +15,7 @@ import java.util.List; @RestController @RequestMapping(value = GrapeConst.API + "/tree") -@Api(tags = "部门/用户", value = "部门/用户") +@Api(tags = "部门用户", value = "部门用户") public class TreeController { diff --git a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java index 06017ee..46804cf 100644 --- a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java @@ -68,7 +68,7 @@ public class AuthServiceImpl extends BaseService implements IA //与数据库的密码进行匹配 if (!loginPassword.equals(loginUser.getPassword())) return AjaxResult.fail("账号或者密码错误"); //判断账号是否停用 - if (loginUser.getStatus()) return AjaxResult.fail("当前账号已被停用，请联系管理员"); + if (!loginUser.getStatus()) return AjaxResult.fail("当前账号已被停用，请联系管理员"); //判断账号角色 if (StrUtil.isBlank(loginUser.getRoles())) return AjaxResult.fail("该用户没有对应的角色，无法登陆系统");