3.5增加登录验证、修改密码、人员列表调整

mitao

2025-03-14 08f1b1f1804a8bd833d42f257908d80e88387b55

 flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java

@@ -13,6 +13,8 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

@Service
@@ -25,51 +27,56 @@
    private TransactionEventMapper transactionEventMapper;

    @Override
    public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
    public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId) {
        List<String> areaCodes = new ArrayList<>();
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
                eq(TransactionEvent::getId, transactionId));
        OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getId, transactionEvent.getDepartmentId()));
        List<String> areaCodes=new ArrayList<>();
        if (organizationChartEntity!=null){
           if (organizationChartEntity.getCity()!=null)
             areaCodes.add(organizationChartEntity.getCity());
           if (organizationChartEntity.getDistrict()!=null)
             areaCodes.add(organizationChartEntity.getDistrict());
           if (organizationChartEntity.getVillage()!=null)
             areaCodes.add(organizationChartEntity.getVillage());
           getAreaCodeIds(areaCodes,organizationChartEntity);
        List<String> departmentIds = new ArrayList<>();
        if (transactionEvent.getDepartmentIds() != null) {
            departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
        }
        if (areaCodes.size()==0)
            return null;
        else
           return baseMapper.selectByIdSet(areaCodes);

        departmentIds.add(transactionEvent.getDepartmentId());
        for (String departmentId : departmentIds) {
            OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
                    .eq(OrganizationChartEntity::getId, departmentId));
            if (organizationChartEntity != null) {
                if (organizationChartEntity.getCity() != null)
                    areaCodes.add(organizationChartEntity.getCity());
                if (organizationChartEntity.getDistrict() != null)
                    areaCodes.add(organizationChartEntity.getDistrict());
                if (organizationChartEntity.getVillage() != null)
                    areaCodes.add(organizationChartEntity.getVillage());
            }

        }
        return baseMapper.selectByIdSet(areaCodes);
    }


    public  List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity){
       List<OrganizationChartEntity>  organizationChartEntitys= organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
    public List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity) {
        List<OrganizationChartEntity> organizationChartEntitys = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getParentId, organizationChartEntity.getId()));
        for (OrganizationChartEntity organizationChart:organizationChartEntitys) {
            if (organizationChart.getCity()!=null)
        for (OrganizationChartEntity organizationChart : organizationChartEntitys) {
            if (organizationChart.getCity() != null)
                areaCodes.add(organizationChart.getCity());
            if (organizationChart.getDistrict()!=null)
            if (organizationChart.getDistrict() != null)
                areaCodes.add(organizationChart.getDistrict());
            if (organizationChart.getVillage()!=null)
            if (organizationChart.getVillage() != null)
                areaCodes.add(organizationChart.getVillage());
            getAreaCodeIds(areaCodes,organizationChart);
            getAreaCodeIds(areaCodes, organizationChart);
        }
        return  areaCodes;
        return areaCodes;
    }

    @Override
    public  List<AreaCode2022> getListByPCode(String id){
    public List<AreaCode2022> getListByPCode(String id) {
        List<AreaCode2022> areaCode2022s = baseMapper.selectList(new QueryWrapper<AreaCode2022>().lambda().eq(AreaCode2022::getPcode, id));
        for (AreaCode2022 areaCode2022:areaCode2022s) {
            if (areaCode2022.getLevel()!=4)
              areaCode2022.setChild(this.getListByPCode(areaCode2022.getCode().toString()));
        for (AreaCode2022 areaCode2022 : areaCode2022s) {
            if (areaCode2022.getLevel() != 3)
                areaCode2022.setChild(this.getListByPCode(areaCode2022.getCode().toString()));
        }
      return  areaCode2022s;
        return areaCode2022s;
    }