From c0e05cba0ad668028348eaf435e8107bf5410b90 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 5 May 2022 14:05:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA--=E5=8C=BA=E5=88=86=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectCommentEOServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java index 01c9d965d..896dbd2ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectCommentEO; import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ProjectCommentEOMapper; import com.jero.modules.project.service.IProjectCommentEOService; import com.jero.modules.project.service.IProjectReplyEOService; @@ -30,6 +31,8 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl getInfoList(ProjectCommentEO projectCommentEOTemp) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //评论的内容 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()).in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId()); + + //验证当前用户在该项目中是什么角色 + int isProjectRole = projectLawsInventoryEOService.checkUserRole(projectCommentEOTemp.getProjectLibraryId(), sysUser.getId(), ""); + if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){ + //studio工程师(某一条项目中所有的评论和回复) + //其他角色(只能看自己评论,自己回复和studio工程师回复的) + wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()); + } + //评论的内容 + wrapper.in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId()); wrapper.orderByDesc(ProjectCommentEO::getCreateTime); List projectCommentEOS = this.list(wrapper); List projectCommentIdList = projectCommentEOS.stream().map(ProjectCommentEO::getId).collect(Collectors.toList());