From b58bc365af4c69d3620d1a20ee37915c740a61cb Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 12 Apr 2024 21:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/worklog/LogInstanceController.java | 1 + .../worklog/vo/loginstance/LogInstancePageReqVO.java | 9 ++++++++- .../module/system/dal/dataobject/worklog/LogReadDo.java | 5 +++++ .../system/service/worklog/LogReadServiceImpl.java | 1 + .../system/service/worklog/dto/LogReadUserRespDTO.java | 5 +++++ .../src/main/resources/mapper/user/LogInstanceMapper.xml | 2 +- 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java index 74dbad00..885a4faa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java @@ -85,6 +85,7 @@ public class LogInstanceController { @Operation(summary = "获得我收到的日志分页列表") @PreAuthorize("@ss.hasPermission('system:view-log:query')") public CommonResult> getLogInstancePage(@Valid LogInstancePageReqVO pageReqVO) { + PageResult pageResult = logInstanceService.getLogInstancePage(pageReqVO); return success(BeanUtils.toBean(pageResult, LogInstanceRespVO.class)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java index 57e37eb3..c49a9cd7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload.UploadUserFile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -48,4 +47,12 @@ public class LogInstancePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "其他数据") + private OtherData data; + + private static class OtherData{ + + private List deptIds; + + } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java index bfa94f9a..5b6321cf 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java @@ -40,6 +40,11 @@ public class LogReadDo extends BaseDO { */ private Long readUserId; + /** + * 日志查看人的部门编号 + */ + private Long readUserDept; + /** * 日志查看状态 * 0：未读 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogReadServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogReadServiceImpl.java index 3f6245e3..898307cf 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogReadServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogReadServiceImpl.java @@ -30,6 +30,7 @@ public class LogReadServiceImpl implements LogReadService{ LogReadDo logReadDo = new LogReadDo(); logReadDo.setLogInstanceId(logInstanceId); logReadDo.setStartUserId(startUserId); + logReadDo.setReadUserDept(user.getDeptId()); logReadDo.setReadUserId(user.getUserId()); logReadDo.setReadStatus(0); return logReadDo; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java index f3b16d1d..6afe3c28 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java @@ -13,4 +13,9 @@ public class LogReadUserRespDTO { * 可查看日志的用户编号 */ private Long userId; + + /** + * 可查看日志的用户部门编号 + */ + private Long deptId; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml index e115a2c1..1400c173 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml @@ -10,7 +10,7 @@ -->