From a50b04c9ecd37c4ce3ab111b0751d03ea81807e3 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Mon, 15 Apr 2024 22:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=95=B0=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/comment/WorkLogCommentServiceImpl.java      | 3 ++-
 .../module/system/service/worklog/LogInstanceServiceImpl.java  | 2 +-
 2 files changed, 3 insertions(+), 2 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 7f7d5086..6a4ccbe8 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
@@ -125,7 +125,8 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService {
                 .eq(WorkLogCommentDO::getUserId, userId)
                 .eq(WorkLogCommentDO::getType, 0)));
         Integer replyNum = Math.toIntExact(workLogCommentMapper.selectCount(new LambdaQueryWrapper<WorkLogCommentDO>()
-                .eq(WorkLogCommentDO::getUserId, userId)
+                .and(a -> a.eq(WorkLogCommentDO::getUserId, userId)
+                        .or().eq(WorkLogCommentDO::getCommentUserId, userId))
                 .eq(WorkLogCommentDO::getType, 1)));
         vo.setCommentNum(commentNum);
         vo.setReplyNum(replyNum);
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 e28d5690..ab6867ac 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
@@ -106,7 +106,7 @@ public class LogInstanceServiceImpl implements LogInstanceService {
         //设置日志类型
         logInstance.setType(logRuleDO.getType());
         //设置日志名称
-        logInstance.setName(adminUserDO.getNickname() + "的" + logFormDo.getName());
+        logInstance.setName(adminUserDO.getNickname() + createReqVO.getTime() + "的" + logFormDo.getName());
 
         // 插入提交状态
         Date thisDate = new Date();