chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

This commit is contained in:
s2042968 2025-03-06 13:50:17 +08:00
parent 8e3f27eeaf f51f76fa6d
commit f05803432f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -220,7 +220,10 @@ public class CommonService {
} }
if (DataOwnEnum.isPrjCode(dataOwnCode)) { if (DataOwnEnum.isPrjCode(dataOwnCode)) {
queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code).in(EdFileInfo::getId, prjIds); queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code);
if (CollUtil.isNotEmpty(prjIds)) {
queryWrapper.in(EdFileInfo::getId, prjIds);
}
} }
List<String> ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList()); List<String> ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
List<String> projectVOS = new ArrayList<>(); List<String> projectVOS = new ArrayList<>();