gis树桩菜单修复

sgj

2026-03-25 8bb88ec2ed80687858d0aa9f53b78f407f4045dd

gis树桩菜单修复

 fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java

@@ -157,8 +157,7 @@
        List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
        view.put("deptList", deptList);
        String deptId = (deptList != null && !deptList.isEmpty()) ? deptList.get(0).getDeptId() : null;
//        view.put("defaultDeptId", deptId != null ? deptId : "00");
        view.put("defaultDeptId","5372001001");
        view.put("defaultDeptId", deptId != null ? deptId : "5372001001");
        //获取所有仓库
        List<GroupDepotData> depotList = groupManager.getDepotData(user.getCompanyId());
        view.put("depotList", depotList);

 fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java

@@ -21,6 +21,7 @@
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @Description
@@ -54,6 +55,10 @@

    @Resource
    private PledgeContractService pledgeContractService;


    @Resource
    private  PledgeContractDepotService pledgeContractDepotService;

    /**
     * 获取省及下属市州集合
@@ -150,7 +155,15 @@
            for (Dept dept : depotList) {
                Boolean isPledge = false;
                for (PledgeContract pledgeContract : pledgeContractList) {
                    if( dept.getId().equals(pledgeContract.getPledgeDept())){
                    IgdsBaseParam param = new IgdsBaseParam();
                    param.setParentId(pledgeContract.getId());
                    List<PledgeContractDepot> pledgeContractDepots = pledgeContractDepotService.listAll(param);
                    if (null == pledgeContractDepots || pledgeContractDepots.isEmpty()){
                        continue;
                    }
                    //找到pledgeContractDepots中的deptId集合，并去重
                    List<String> deptIdList = pledgeContractDepots.stream().map(PledgeContractDepot::getPledgeDept).distinct().collect(Collectors.toList());
                    if( deptIdList.contains(dept.getId())){
                        //从list中找到当前质押银行的数据
                        DicArea pledgeBank = null;
                        int indexBank = -1;
@@ -201,11 +214,9 @@
                            areaChildren.set(indexBank,pledgeBank);
                            isPledge=true;
                            break;

                        }


                    }

                }
                if(!isPledge){
                    DicArea deptDic = new DicArea();