Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java

@@ -54,7 +54,7 @@
        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
        Integer integer = comStreetDAO.selectCount(param);
        if (integer > 0) {
            return R.fail("街道已经存在");
            return R.fail(500, "街道已经存在");
        }
        BeanUtils.copyProperties(comStreetVO, comStreetDO);
        int insert = comStreetDAO.insert(comStreetDO);
@@ -63,7 +63,7 @@
            BeanUtils.copyProperties(comStreetDO1, comStreetVO);
            return R.ok(comStreetVO);
        }
        return R.fail();
        return R.fail(500, "");
    }


@@ -85,8 +85,14 @@
        if (comStreetVO.getAreaCode() != null) {
            param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
        }
        List<ComStreetVO> voList = Lists.newArrayList();
        List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
        return R.ok(comStreetDOS);
        comStreetDOS.forEach(dos -> {
            ComStreetVO vo = new ComStreetVO();
            BeanUtils.copyProperties(dos, vo);
            voList.add(vo);
        });
        return R.ok(voList);
    }

    /**
@@ -119,10 +125,10 @@
        Long pageNum = pageComStreetDTO.getPageNum();
        Long pageSize = pageComStreetDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
@@ -138,6 +144,7 @@

    /**
     * 批量删除街道
     *
     * @param streetIds 社区id
     * @return 删除结果
     */
@@ -155,6 +162,5 @@
        }
        return R.fail();
    }


}