Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

5 天以前 e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831

 src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java

@@ -79,11 +79,11 @@
    @Override
    public SimpleFileVo getSimpleFileVoById(Long id) {
        if(id == null){
            return new SimpleFileVo();
            return null;
        }
        List<CustomerFollowUpFile> followUpFilesByIds = customerFollowUpService.getFollowUpFilesByIds(Lists.newArrayList(id));
        if(CollUtil.isEmpty(followUpFilesByIds)){
            return new SimpleFileVo();
            return null;
        }
        return SimpleFileVo.convert(followUpFilesByIds.get(0));
    }