diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java index 633a5183..cce622be 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java @@ -2,10 +2,7 @@ package com.ccsens.tall.persist.dao; import com.ccsens.tall.bean.dto.LwbsDto; import com.ccsens.tall.bean.po.SysProject; -import com.ccsens.tall.bean.vo.ChartVo; -import com.ccsens.tall.bean.vo.LwbsVo; -import com.ccsens.tall.bean.vo.PluginVo; -import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.*; import com.ccsens.tall.persist.mapper.SysProjectMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -79,4 +76,12 @@ public interface SysProjectDao extends SysProjectMapper{ * @return */ ProjectVo.RoleInfo selectProjectInfoByProAndMem(Long roleId); + + /** + * 查询未添加的项目虚拟角色 + * @param projectId + * @param listBeforeId + * @return + */ + List selectProjectRoleNoAdd(@Param("projectId") Long projectId,@Param("listBeforeId") List listBeforeId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 8025b128..b624266d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -852,6 +852,7 @@ public class ProRoleService implements IProRoleService { } } //查询未添加的角色 + List listNoAddRoles = new ArrayList<>(); List listAfter=proRoleDao.queryRoleShowslistBefore(param.getParam().getProjectId(),listBeforeId); for (int i = 0; i < listAfter.size(); i++) { //是否项目经理 @@ -868,8 +869,19 @@ public class ProRoleService implements IProRoleService { listAfter.get(i).setMine(false); } } + listNoAddRoles.add(listAfter.get(i)); } - jueSeByProIdLists.setListAfter(listAfter); + //查询未添加的虚拟项目角色 + List listAfter1 = projectDao.selectProjectRoleNoAdd(param.getParam().getProjectId(),listBeforeId); + if (CollectionUtil.isNotEmpty(listAfter1)){ + for (RoleVo.JueSeByProId projectRole : listAfter1) { + projectRole.setProjectRole(1); + projectRole.setRelevanceProjectId(projectRole.getId()); + projectRole.setRelevanceProjectName(projectRole.getName()); + listNoAddRoles.add(projectRole); + } + } + jueSeByProIdLists.setListAfter(listNoAddRoles); jueSeByProIdLists.setListBefore(listBefor); return jueSeByProIdLists; } diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml index ca7e85e2..184f860a 100644 --- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml @@ -354,23 +354,42 @@ and tpmrs.member_id=#{memberId} order by tpmrs.sequence + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file