diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java index d63e2dfe9..714a1bcc0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectRxswinEOMapper extends BaseMapper { - List queryProjectLibraryBaseList(@Param("projectLibraryId") String projectLibraryId); + List queryProjectLibraryBaseList(@Param("id") String id, + @Param("parentId") String parentId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml index 1f2a844c6..ed116b16d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml @@ -34,7 +34,7 @@ LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market - where plb.parent_id = #{projectLibraryId} - or plb.id = #{projectLibraryId} + where plb.parent_id = #{parentId} + or plb.id = #{id} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 34aedc963..2118d7edf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -51,6 +51,8 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getOnePage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { - List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(projectRxswinEO.getProjectId()); + ProjectLibraryBase libraryBase = projectLibraryBaseService.getById(projectRxswinEO.getProjectId()); + String id = ""; + String parentId = ""; + if(StringUtils.isBlank(libraryBase.getParentId())){ + id = libraryBase.getId(); + parentId = libraryBase.getId(); + }else{ + id = libraryBase.getParentId(); + parentId = libraryBase.getParentId(); + } + List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(id,parentId); for (ProjectLibraryBase projectLibraryBase : libraryBaseList) { //项目名称 String projectName = "";