From f3a28c8aae8cd8c7a5a1445e0aa4bad05eb3eed9 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Sun, 29 Sep 2024 15:42:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86):=20=E6=88=90=E5=91=98?= =?UTF-8?q?=E7=A7=BB=E5=87=BA=E7=BB=84=E7=BB=87/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=8C=87=E6=B4=BE=E7=BB=99=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E5=B7=A5=E4=BD=9C=E9=A1=B9/?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AF=A5=E6=80=8E=E4=B9=88=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 项目管理中获取用户信息时判断用户是否已离职，若已离职进行标记 2. 项目可选成员列表中需排除已离职用户 --- .../service/impl/PmsCommonServiceImpl.java | 7 +++++++ .../impl/PmsProjectMembersServiceImpl.java | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonServiceImpl.java index 157b26f02..617535d2e 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonServiceImpl.java @@ -3,6 +3,7 @@ package com.microservices.pms.common.service.impl; import com.alibaba.fastjson2.JSONArray; import com.microservices.common.core.constant.SecurityConstants; import com.microservices.common.core.constant.UserConstants; +import com.microservices.common.core.enums.UserIdentityStatus; import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.utils.StringUtils; import com.microservices.common.httpClient.util.GitLinkRequestHelper; @@ -146,6 +147,12 @@ public class PmsCommonServiceImpl implements IPmsCommonService if(sysUser==null){ return null; } + SysUserDeptRole userIdentity = FeignUtils.getReturnData( + remoteUserService.getAllStatusUserIdentityByDeptIdAndUserId(SecurityUtils.getDeptId(), sysUser.getUserId(), SecurityConstants.INNER) + ); + if (userIdentity != null && UserIdentityStatus.QUIT.getState().equals(userIdentity.getState())) { + sysUser.setNickName(sysUser.getNickName() + "(已离职)"); + } return sysUser.toSimpleSysUser(gitLinkRequestHelper.gitLinkUrl); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java index 21f6bdf4e..996904dac 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java @@ -1,5 +1,7 @@ package com.microservices.pms.project.service.impl; +import com.microservices.common.core.constant.SecurityConstants; +import com.microservices.common.core.enums.UserIdentityStatus; import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.utils.PageUtils; import com.microservices.common.core.web.page.GenericsTableDataInfo; @@ -12,7 +14,10 @@ import com.microservices.pms.project.domain.vo.PmsProjectMembersSearchVo; import com.microservices.pms.project.mapper.PmsProjectMembersMapper; import com.microservices.pms.project.service.IPmsProjectMembersService; import com.microservices.pms.project.service.IPmsProjectService; +import com.microservices.system.api.RemoteUserService; import com.microservices.system.api.domain.SimpleSysUser; +import com.microservices.system.api.domain.SysUserDeptRole; +import com.microservices.system.api.utils.FeignUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -21,6 +26,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 项目-成员Service业务层处理 @@ -40,6 +46,8 @@ public class PmsProjectMembersServiceImpl implements IPmsProjectMembersService @Autowired @Lazy private IPmsProjectService pmsProjectService; + @Autowired + private RemoteUserService remoteUserService; /** * 查询项目-成员 @@ -67,8 +75,14 @@ public class PmsProjectMembersServiceImpl implements IPmsProjectMembersService @Override public GenericsTableDataInfo selectPmsProjectMembersList(PmsProjectMembers pmsProjectMembers) { - pmsProjectService.selectAndCheckPmsProjectById(pmsProjectMembers.getPmsProjectId()); + PmsProject pmsProject = pmsProjectService.selectAndCheckPmsProjectById(pmsProjectMembers.getPmsProjectId()); List list = pmsProjectMembersMapper.selectPmsProjectMembersList(pmsProjectMembers); + list = list.stream().filter(x -> { + SysUserDeptRole userIdentity = FeignUtils.getReturnData( + remoteUserService.getAllStatusUserIdentityByDeptIdAndUserId(pmsProject.getDeptId(), x.getUserId(), SecurityConstants.INNER) + ); + return userIdentity != null && !UserIdentityStatus.QUIT.getState().equals(userIdentity.getState()); + }).collect(Collectors.toList()); return PageUtils.toPage(list, x -> { PmsProjectMembersDetailVo pmsProjectMembersDetailVo = new PmsProjectMembersDetailVo(); BeanUtils.copyProperties(x, pmsProjectMembersDetailVo);