合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutyfileInfoServiceImpl.java

@@ -30,9 +30,9 @@

    @Autowired
    private TargetDutyfileInfoRepository targetDutyfileInfoRepository;



    
    
	
   @Override
    public ResultVO queryAll(PageQuery<TargetDutyfileInfoQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -42,6 +42,8 @@
        page = baseMapper.selectPage(page,
                QueryHelpPlus.getPredicate(TargetDutyfileInfo.class, pageQuery.getSearchParams()));
        List<TargetDutyfileInfoDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDutyfileInfoDto.class);

        // TODO 岗位名

        return new SearchResultVO<>(
                true,
@@ -58,4 +60,4 @@
    public List<TargetDutyfileInfo> queryAll(TargetDutyfileInfoQueryCriteria criteria) {
        return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetDutyfileInfo.class, criteria));
    }
}
}