|
@@ -100,7 +100,9 @@ public class ManageServiceImpl implements ManageService {
|
|
|
List<Long> costTypeIds = new ArrayList<>();
|
|
List<Long> costTypeIds = new ArrayList<>();
|
|
|
manages.stream().forEach(m -> {
|
|
manages.stream().forEach(m -> {
|
|
|
deptIds.add(m.getDeptId());
|
|
deptIds.add(m.getDeptId());
|
|
|
- projectIds.add(m.getProjectId());
|
|
|
|
|
|
|
+ if(Objects.nonNull(m.getProjectId())){
|
|
|
|
|
+ projectIds.add(m.getProjectId());
|
|
|
|
|
+ }
|
|
|
if(Objects.equals(m.getType(), ManageTypeEnum.COST)){
|
|
if(Objects.equals(m.getType(), ManageTypeEnum.COST)){
|
|
|
switch (m.getCompanyType()){
|
|
switch (m.getCompanyType()){
|
|
|
case COMPANY:
|
|
case COMPANY:
|
