From ed145dd7ffcc83ac9ae9f6f3e5c0ae75321a8e04 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 26 Aug 2024 16:03:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=BC=93=E6=85=A2=E9=97=AE=E9=A2=98=202.=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/system/service/impl/AuditServiceImpl.java | 3 +-- .../java/com/njcn/user/controller/PassWordRuleController.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 5898efc0e..fd1efc2df 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -111,8 +111,7 @@ public class AuditServiceImpl extends ServiceImpl implem QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper .between("sys_user_log.create_time", DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())), - DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime()))) - .ne("sys_user_log.login_name", UNKNOWN_USER); + DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime()))); if (StrUtil.isNotBlank(auditParam.getLoginName())) { queryWrapper.eq("sys_user_log.login_name", auditParam.getLoginName()); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java index ccc16fc61..b712e3c68 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java @@ -55,10 +55,10 @@ public class PassWordRuleController extends BaseController { } @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("获取密码规则") + @ApiOperation("获取用户策略") @RequestMapping(value = "/getUserStrategy", method = RequestMethod.POST) public HttpResult getUserStrategy() { - String methodDescribe = getMethodDescribe("getRule"); + String methodDescribe = getMethodDescribe("getUserStrategy"); UserStrategy userStrategy = passWordRuleService.getUserStrategy(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userStrategy, methodDescribe);