转移门店

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ProjectApiServiceImpl.java

@@ -2,7 +2,6 @@ package com.gic.enterprise.service.outer.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.commons.util.CollectionUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.PageHelperUtils;
@@ -21,8 +20,10 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -100,7 +101,9 @@ public class ProjectApiServiceImpl implements ProjectApiService{
         List<ProjectDTO> projectList = EntityUtil.changeEntityListByJSON(ProjectDTO.class, tabProjectList);
         List<TabProjectItem> tabItemList = projectItemService.listAllProjectItem();
         List<ProjectItemDTO> itemList = EntityUtil.changeEntityListByJSON(ProjectItemDTO.class, tabItemList);
-        Map<Integer, List<ProjectItemDTO>> group = CollectionUtil.group(itemList, "projectId");
+        Map<Integer, List<ProjectItemDTO>> group = Optional.ofNullable(itemList).orElse(Collections.emptyList()).stream()
+                .filter(e -> e.getUseStatus() == 1).collect(Collectors.groupingBy(ProjectItemDTO::getProjectId, Collectors.mapping(e -> e, Collectors.toList())));
+//        Map<Integer, List<ProjectItemDTO>> group = CollectionUtil.group(itemList, "projectId");
         for (ProjectDTO projectDTO : projectList) {
             projectDTO.setItemList(group.get(projectDTO.getProjectId()));
         }