返回组织类型

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java

@@ -15,6 +15,7 @@ import java.io.Serializable;
 public class OrgProjectDetailResultDTO implements Serializable {
     private static final long serialVersionUID = 6333117500929136144L;
     private String orgId;
+    private String orgType;
     private String orgName;
     private Integer memberCount = 0;
     private Integer projectCount = 0;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -1166,7 +1166,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         }
         CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
         if (null == agencyEntity) {
-            return null;
+            return new PageData<>(Collections.emptyList(), NumConstant.ZERO);
         }
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         long total = 0;
@@ -1188,6 +1188,7 @@ public class GovOrgServiceImpl implements GovOrgService {
                 resultList = gridList.stream().map(grid -> {
                     OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO();
                     dto.setOrgId(grid.getId());
+                    dto.setOrgType(OrgConstant.GRID);
                     dto.setOrgName(grid.getGridName());
                     if (projectMap.containsKey(grid.getId())) {
                         dto.setProjectCount(projectMap.get(grid.getId()));
@@ -1227,6 +1228,7 @@ public class GovOrgServiceImpl implements GovOrgService {
                 resultList = agencyList.stream().map(agency -> {
                     OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO();
                     dto.setOrgId(agency.getId());
+                    dto.setOrgType(OrgConstant.AGENCY);
                     dto.setOrgName(agency.getOrganizationName());
                     if (projectMap.containsKey(agency.getId())) {
                         dto.setProjectCount(projectMap.get(agency.getId()).getProjectTotal());