From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
index dd8a675..1f9b4c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -1,5 +1,14 @@
package com.panzhihua.service_community.service.impl;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,13 +24,6 @@
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.ComStreetService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* @author: llming
@@ -38,7 +40,8 @@
/**
* 新增社区
*
- * @param comStreetVO 街道信息
+ * @param comStreetVO
+ * 街道信息
* @return 新增结果
*/
@Override
@@ -66,11 +69,11 @@
return R.fail(500, "");
}
-
/**
* 查询街道
*
- * @param comStreetVO 街道名
+ * @param comStreetVO
+ * 街道名
* @return 社区集合
*/
@Override
@@ -98,7 +101,8 @@
/**
* 社区详情
*
- * @param streetId 街道id
+ * @param streetId
+ * 街道id
* @return 社区详情
*/
@Override
@@ -116,7 +120,8 @@
/**
* 分页查询社区
*
- * @param pageComStreetDTO 查询参数
+ * @param pageComStreetDTO
+ * 查询参数
* @return 分页集合
*/
@Override
@@ -137,21 +142,23 @@
userLambdaQueryWrapper.like(ComStreetDO::getName, pageComStreetDTO.getName());
}
Page userPage = new Page(pageNum, pageSize);
- IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
+ IPage<ComStreetDO> doPager =
+ comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
return R.ok(doPager);
}
-
/**
* 批量删除街道
*
- * @param streetIds 社区id
+ * @param streetIds
+ * 社区id
* @return 删除结果
*/
@Override
public R delectStreat(List<Long> streetIds) {
- //不能删除，已经绑定了社区的街道
- LambdaQueryWrapper<ComActDO> comActDOParam = new QueryWrapper<ComActDO>().lambda().in(ComActDO::getStreetId, streetIds);
+ // 不能删除，已经绑定了社区的街道
+ LambdaQueryWrapper<ComActDO> comActDOParam =
+ new QueryWrapper<ComActDO>().lambda().in(ComActDO::getStreetId, streetIds);
List<ComActDO> comActDOS = comActDAO.selectList(comActDOParam);
if (comActDOS != null && comActDOS.size() > 0) {
return R.fail("删除失败，批量删除街道中，街道下有社区无法删除！");
--
Gitblit v1.7.1