zhubaomin
2024-08-21 7978f5dcd6a71795431e38d5387c4a52fa5f1b38
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -83,7 +83,7 @@
     * @return
     */
    public QueryResultVo<List<VoBlock>> getBlocks(QueryVo vo){
        vo.setPageCurr((vo.pageCurr -1) * vo.pageSize);
        vo.setPageCurr((vo.getPageCurr() -1) * vo.getPageSize());
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
        Long itemTotal = this.dao.getBlocksCount(params) ;
@@ -93,12 +93,13 @@
        // 获取片区列表
        List<VoBlock> list_blocks = this.dao.getBlocks(params);
        if(list_blocks != null && list_blocks.size() > 0) {
            //JSONArray array_blocks = (JSONArray) JSON.toJSON(list_blocks);
            array_blocks = (JSONArray) JSON.toJSON(list_blocks);
            for (int i = 0; i < array_blocks.size(); i++) {
                JSONObject job_block = array_blocks.getJSONObject(i);
                Long blockId = job_block.getLong("id");
                // 处理一个新的片区前清空graphs,避免上一个片区的graphs存留数据造成数据错误
                array_mapGraphs = null;
                // 根据片区ID获取地图图形列表
                List<VoMapGraph> list_mapGraphs = this.dao.gertMapGraphsByBlockId(blockId);
                if(list_mapGraphs != null && list_mapGraphs.size() > 0) {
@@ -126,6 +127,9 @@
                    job_block.put("graphs", array_mapGraphs);
                }
            }
        }else {//增加健壮性
            QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
            return rsVo ;
        }
        QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;