java/zhihuishenqu.git

			@@ -21,6 +21,7 @@
			import org.springframework.util.ObjectUtils;

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

			/**
			@@ -54,7 +55,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 +64,7 @@
			BeanUtils.copyProperties(comStreetDO1, comStreetVO);
			return R.ok(comStreetVO);
			}
			return R.fail();
			return R.fail(500,"");
			}


			@@ -85,8 +86,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);
			}

			/**
			@@ -131,13 +138,14 @@
			userLambdaQueryWrapper.like(ComStreetDO::getName, pageComStreetDTO.getName());
			}
			Page userPage = new Page(pageNum, pageSize);
			IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper);
			IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
			return R.ok(doPager);
			}


			/**
			* 批量删除街道
			*
			* @param streetIds 社区id
			* @return 删除结果
			*/