diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java index 680615106..5566e8fb5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java @@ -152,7 +152,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC List pcmList = paramsManifestEOListMap.get(paramsManifestTodoCenterEO.getId()); int count = 0; - if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId())) { + if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) + && ObjectUtil.isNotEmpty(manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId()))) { // 统计待发起数量 包括状态:待发起收集,变更,工程接口人退回 count = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.getState()) @@ -172,7 +173,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC if (count > 0) { paramsManifestTodoCenterEO.setWaitFillNum(count); } - } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfSdt.get(paramsManifestTodoCenterEO.getId())) { + } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) + && ObjectUtil.isNotEmpty(manifestUserTypeOfSdt.get(paramsManifestTodoCenterEO.getId()))) { // 统计待分配数量 包括状态:待工程接口人处理,填写人退回 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState()) || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState())) @@ -187,7 +189,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC paramsManifestTodoCenterEO.setWaitFillNum(count); } - } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfDre.get(paramsManifestTodoCenterEO.getId())) { + } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) + && ObjectUtil.isNotEmpty(manifestUserTypeOfDre.get(paramsManifestTodoCenterEO.getId()))) { // 统计待填写数量 包括状态:待填写,认证工程师退回 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState()) || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))