flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -27,12 +28,14 @@
    @Override
    public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
//        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
        List<String> areaCodes = new ArrayList<>();
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
                eq(TransactionEvent::getId, transactionId));
        List<String> departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
        departmentIds.add(transactionEvent.getDepartmentId());
        for (String departmentId : departmentIds) {
        OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getId, transactionEvent.getDepartmentId()));
        List<String> areaCodes=new ArrayList<>();
                    .eq(OrganizationChartEntity::getId, departmentId));
        if (organizationChartEntity!=null){
           if (organizationChartEntity.getCity()!=null)
             areaCodes.add(organizationChartEntity.getCity());
@@ -40,11 +43,9 @@
             areaCodes.add(organizationChartEntity.getDistrict());
           if (organizationChartEntity.getVillage()!=null)
             areaCodes.add(organizationChartEntity.getVillage());
           getAreaCodeIds(areaCodes,organizationChartEntity);
        }
        if (areaCodes.size()==0)
            return null;
        else
        }
           return baseMapper.selectByIdSet(areaCodes);
    }