ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 日志查询， 重复日志提交校验改为 根据模板id进行校验

Browse Source 
修改 可查看人的SQL 最佳deleted条件
This commit is contained in:
furongxin 2024-09-03 14:42:04 +08:00
parent 2416cdebd2
commit 719571612b
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
View File

@ -209,7 +209,7 @@ public interface ErrorCodeConstants {
ErrorCode CANNOT_FIND_THE_RECORD_THAT_NEEDS_TO_BE_REPLACED = new ErrorCode(1_003_018_000, "查询不到需要补卡的记录"); 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, "模板不存在"); ErrorCode LOG_USE_NOT_EXISTS = new ErrorCode(1_009_010_005, "模板不存在");

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
View File

@ -31,10 +31,10 @@ public interface LogInstanceMapper extends BaseMapperX<LogInstanceDO> {
.orderByDesc(LogInstanceDO::getCreateTime)); .orderByDesc(LogInstanceDO::getCreateTime));
} }
default Long getLogByType(Integer type, Long userId, List<String> dateList) { default Long getLogByFormId(Long formId, Long userId, List<String> dateList) {
return selectCount(new LambdaQueryWrapperX<LogInstanceDO>() return selectCount(new LambdaQueryWrapperX<LogInstanceDO>()
.eq(LogInstanceDO::getType, type) .eq(LogInstanceDO::getFormId, formId)
.eq(LogInstanceDO::getStartUserId, userId) .eq(LogInstanceDO::getStartUserId, userId)
.in(LogInstanceDO::getTime, dateList)); .in(LogInstanceDO::getTime, dateList));
} }

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
View File

@ -168,7 +168,7 @@ public class LogInstanceServiceImpl implements LogInstanceService {
createReqVO.setTime(times[1]); createReqVO.setTime(times[1]);
} }
Long count = logInstanceMapper.getLogByType(createReqVO.getType(), getLoginUserId(), dateList); Long count = logInstanceMapper.getLogByFormId(createReqVO.getFormId(), getLoginUserId(), dateList);
if (count > 0L) { if (count > 0L) {
throw exception(ErrorCodeConstants.LOG_TYPE_EXISTS); throw exception(ErrorCodeConstants.LOG_TYPE_EXISTS);

11
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
View File

@ -64,7 +64,16 @@
SELECT SELECT
role.id, role.data_scope, role.data_scope_dept_ids role.id, role.data_scope, role.data_scope_dept_ids
FROM 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 LEFT JOIN system_role role on role.id = menu.role_id
) role_id ON u_role.role_id = role_id.id ) role_id ON u_role.role_id = role_id.id
WHERE u_role.deleted = 0 WHERE u_role.deleted = 0