diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java index 494d664..34be0a1 100644 --- a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java @@ -10,6 +10,7 @@ import com.whdc.model.vo.AdcdTree; import com.whdc.service.IAdinfoService; import com.whdc.service.IOrganizationService; import com.whdc.service.IUnitDictService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,6 +26,7 @@ import java.util.stream.Collectors; * @date 2024-05-11 */ @Service +@Slf4j public class OrganizationServiceImpl extends ServiceImpl implements IOrganizationService { @Autowired @@ -50,14 +52,14 @@ public class OrganizationServiceImpl extends ServiceImpl list = unitDictService.findByUserId(userId); - List tree = adinfoService.tree(null, null); Map> collect = list.stream().collect(Collectors.groupingBy(UnitDict::getOId)); organizations.forEach(organization -> { List unitDicts = collect.get(organization.getId()); organization.setUnitDicts(unitDicts); String name = organization.getName(); if (name.contains("市") && name.contains("县")){ - organization.setAdinfoList(tree); + organization.setAdinfoList(adinfoService.tree(null, null)); + log.info("Organization:" + organization.getAdinfoList()); } });