diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java new file mode 100644 index 0000000..1e6e785 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java @@ -0,0 +1,4 @@ +package com.casic.missiles.modular.system.service.impl; + +public class LiquidConfigServiceImpl { +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java new file mode 100644 index 0000000..1e6e785 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/LiquidConfigServiceImpl.java @@ -0,0 +1,4 @@ +package com.casic.missiles.modular.system.service.impl; + +public class LiquidConfigServiceImpl { +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java index 9f7449c..b576dd0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -38,9 +39,10 @@ Map deptMap = getDeptList(); Map tenantDeptMap = getTenantDeptList(); List tenants = abstractTenantService.list(query); - List dtos = tenants.stream().filter( - tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap) - ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList()); + List tenantDTOS = new ArrayList<>(); + List dtos = tenants.stream() + .map(tenant -> appendDeptInfo(tenant, tenantDeptMap)) + .collect(Collectors.toList()); return dtos; } @@ -53,7 +55,8 @@ } /** - * 获取部门和pid的map + * 获取部门和pid的map + * * @return */ private Map getDeptList() { @@ -64,7 +67,8 @@ } /** - * 获取tenant、Deptid的map + * 获取tenant、Deptid的map + * * @return */ private Map getTenantDeptList() { @@ -75,7 +79,8 @@ } /** - * 根据部门过滤tenant + * 根据部门过滤tenant + * * @param tenant * @param tenantDeptMap * @param deptId @@ -85,7 +90,7 @@ private Boolean filterByDept(Tenant tenant, Map tenantDeptMap, Long deptId, Map deptMap) { Boolean flag = false; String tempDeptId = tenantDeptMap.get(String.valueOf(tenant.getId())); - while (!StringUtils.isEmpty(tempDeptId)&&!tempDeptId.equals("-1")) { + while (!StringUtils.isEmpty(tempDeptId) && !tempDeptId.equals("-1")) { if (tempDeptId.equals(String.valueOf(deptId))) { flag = true; break; @@ -96,7 +101,8 @@ } /** - * 增加部门信息 + * 增加部门信息 + * * @param tenant * @param tenantDeptMap * @return