From 7cb916ef577d528720ad29ce0ceac98bed514226 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Mon, 27 May 2024 10:09:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=9B=9E=E5=A4=8D=20?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=91=E9=80=81=E4=BA=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/comment/WorkLogCommentServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java index d19fa6b1..687287d8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java @@ -162,10 +162,17 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService { //获得日志详情 LogInstanceRespVO instanceDO = logInstanceService.getLogInstance(workLogComment.getWorkLogId()); - //获得 用户信息Map - Map userMap = userService.getUserMap(Arrays.asList(instanceDO.getStartUserId(), workLogComment.getUserId())); + //获得 userMap + Map userMap = userService.getUserMap(Arrays.asList(instanceDO.getStartUserId(), workLogComment.getCommentUserId(), workLogComment.getUserId())); - String openId = userMap.get(instanceDO.getStartUserId()).getOpenId(); + String openId = null; + if (instanceDO.getType() == 0) { + + openId = userMap.get(instanceDO.getStartUserId()).getOpenId(); + } else if (instanceDO.getType() == 1) { + + openId = userMap.get(workLogComment.getCommentUserId()).getOpenId(); + } if (openId != null) { @@ -174,6 +181,5 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService { openId, workLogComment, userMap.get(workLogComment.getUserId()).getNickname(), "formal")); } - } } \ No newline at end of file From fb0d08162b1275a00587e7c3ca6ea64b71d88686 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Mon, 27 May 2024 15:33:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/worklog/LogInstanceController.java | 2 ++ .../system/controller/app/comment/WorkLogCommentController.java | 2 ++ 2 files changed, 4 insertions(+) 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 d2879650..416aa1a1 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 @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.worklog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO; @@ -151,6 +152,7 @@ public class LogInstanceController { @Operation(summary = "获得可查看日志的用户详情") @Parameter(name = "logId", description = "日志编号", required = true, example = "10") @PreAuthorize("@ss.hasPermission('system:view-log:query')") + @DataPermission(enable = false) public CommonResult>> getUserByLogId(@RequestParam("logId") Long logId) { List> readUserVO = new ArrayList<>(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/WorkLogCommentController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/WorkLogCommentController.java index 2cc45650..44b8f440 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/WorkLogCommentController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/WorkLogCommentController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.system.controller.app.comment; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.module.system.controller.app.comment.dto.CommentDTO; import cn.iocoder.yudao.module.system.controller.app.comment.vo.CommentPageListVO; import cn.iocoder.yudao.module.system.controller.app.comment.vo.CommentTypeCountVO; @@ -27,6 +28,7 @@ public class WorkLogCommentController { @Operation(summary = "用户工作日志评论-分页查询评论列表") @GetMapping(value = "/queryCommentPageList") + @DataPermission(enable = false) public CommonResult> queryCommentPageList(CommentDTO dto, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {