From 719571612b4a0ce42d851ada2d09f30db24ee9e5 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 3 Sep 2024 14:42:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=20=E9=87=8D=E5=A4=8D=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E6=A8=A1=E6=9D=BFid=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E4=BF=AE=E6=94=B9=20=E5=8F=AF=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BA=BA=E7=9A=84SQL=20=E6=9C=80=E4=BD=B3deleted?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/enums/ErrorCodeConstants.java | 2 +- .../system/dal/mysql/worklog/LogInstanceMapper.java | 4 ++-- .../service/worklog/LogInstanceServiceImpl.java | 2 +- .../resources/mapper/worklog/LogInstanceMapper.xml | 11 ++++++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 27b39ef6..65a4cc50 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -209,7 +209,7 @@ public interface ErrorCodeConstants { ErrorCode CANNOT_FIND_THE_RECORD_THAT_NEEDS_TO_BE_REPLACED = new ErrorCode(1_003_018_000, "查询不到需要补卡的记录"); - ErrorCode LOG_FORM_NOT_USE = new ErrorCode(1_009_010_004, "你不用使用该日志模板"); + ErrorCode LOG_FORM_NOT_USE = new ErrorCode(1_009_010_004, "你不能使用该日志模板"); ErrorCode LOG_USE_NOT_EXISTS = new ErrorCode(1_009_010_005, "模板不存在"); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java index bd1fc990..803e4014 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java @@ -31,10 +31,10 @@ public interface LogInstanceMapper extends BaseMapperX { .orderByDesc(LogInstanceDO::getCreateTime)); } - default Long getLogByType(Integer type, Long userId, List dateList) { + default Long getLogByFormId(Long formId, Long userId, List dateList) { return selectCount(new LambdaQueryWrapperX() - .eq(LogInstanceDO::getType, type) + .eq(LogInstanceDO::getFormId, formId) .eq(LogInstanceDO::getStartUserId, userId) .in(LogInstanceDO::getTime, dateList)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java index 9237a0c1..a3988e1b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java @@ -168,7 +168,7 @@ public class LogInstanceServiceImpl implements LogInstanceService { createReqVO.setTime(times[1]); } - Long count = logInstanceMapper.getLogByType(createReqVO.getType(), getLoginUserId(), dateList); + Long count = logInstanceMapper.getLogByFormId(createReqVO.getFormId(), getLoginUserId(), dateList); if (count > 0L) { throw exception(ErrorCodeConstants.LOG_TYPE_EXISTS); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml index d48525ac..0b82e11b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml @@ -64,7 +64,16 @@ SELECT role.id, role.data_scope, role.data_scope_dept_ids FROM - ( SELECT role_id FROM system_role_menu a LEFT JOIN system_menu role ON a.menu_id = role.id WHERE role.permission = 'system:view-log:query' AND a.role_id != 1 AND a.role_id != 101 ) menu + ( + SELECT role_id + FROM system_role_menu a + LEFT JOIN system_menu role ON a.menu_id = role.id + WHERE + role.permission = 'system:view-log:query' + AND a.role_id != 1 + AND a.role_id != 101 + AND a.deleted = 0 + ) menu LEFT JOIN system_role role on role.id = menu.role_id ) role_id ON u_role.role_id = role_id.id WHERE u_role.deleted = 0