Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
43cdae60bf
|
|
@ -46,7 +46,7 @@ public class DevInfoServiceImpl implements IDevInfoService
|
||||||
{
|
{
|
||||||
DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId);
|
DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId);
|
||||||
List<SysFile> files = devInfoMapper.getFilesByMaId(maId);
|
List<SysFile> files = devInfoMapper.getFilesByMaId(maId);
|
||||||
if (!CollectionUtils.isEmpty(files)) {
|
if (!CollectionUtils.isEmpty(files) && files.get(0) != null) {
|
||||||
List<String> picList = new ArrayList();
|
List<String> picList = new ArrayList();
|
||||||
for (SysFile file : files) {
|
for (SysFile file : files) {
|
||||||
if (ASPECT_PICTURE.equals(file.getName())) {
|
if (ASPECT_PICTURE.equals(file.getName())) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue