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

Merge branch 'dev' into frx

Browse Source
This commit is contained in:
furongxin 2024-08-13 11:50:16 +08:00
commit bc39b32808
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java
View File

@ -153,6 +153,7 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService {
Integer receiveNum = workLogCommentMapper.selectCountReceiveNum(userId);
vo.setCommentNum(commentNum);
vo.setReceiveNum(receiveNum);
vo.setReplyNum(replyNum);
vo.setAllNum(commentNum + replyNum + receiveNum);
return vo;

2
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/comment/WorkLogCommentMapper.xml
View File

@ -48,7 +48,7 @@
</if>
<if test="dto.isCommentOnMyBlog != null and dto.isCommentOnMyBlog == 1">
<if test="dto.userId != null">
AND f.start_user_id = #{userId}
AND f.start_user_id = #{dto.userId}
</if>
</if>
<if test="dto.isCommentOnMyBlog == null or dto.isCommentOnMyBlog == 0">