From 8555f974846ca5b4f4734f52b51e39cd4502df44 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 02 四月 2021 15:46:30 +0800
Subject: [PATCH] fix：修改bug
---
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java | 50 ++++++++---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java | 12 +-
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java | 39 ++++-----
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java | 10 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java | 50 ++++++------
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 10 ++
10 files changed, 110 insertions(+), 73 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
index 1b620cc..3dedaf1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -34,9 +34,9 @@
@Resource
private UserService userService;
- @ApiOperation(value = "分页查询小区",response = ComMngStructAreaVO.class )
+ @ApiOperation(value = "分页查询小区", response = ComMngStructAreaVO.class)
@PostMapping("pagearea")
- public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
return communityService.pageArea(comMngStructAreaVO);
}
@@ -45,15 +45,15 @@
// */
// private String panzhihuajson="[{\"district_name\":\"仁和区\",\"city_adcode\":510400,\"district_adcode\":510411,\"province_id\":23,\"id\":2004,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"米易县\",\"city_adcode\":510400,\"district_adcode\":510421,\"province_id\":23,\"id\":2005,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"盐边县\",\"city_adcode\":510400,\"district_adcode\":510422,\"province_id\":23,\"id\":2006,\"province_adcode\":510000,\"city_id\":256}]";
- @ApiOperation(value = "新增社区",response = ComActVO.class)
+ @ApiOperation(value = "新增社区", response = ComActVO.class)
@PostMapping("community")
- @OperLog(operModul = "社区管理",operType = 1)
- public R addCommunity(@Validated(AddGroup.class) @RequestBody ComActVO comActVO){
+ @OperLog(operModul = "社区管理", operType = 1)
+ public R addCommunity(@Validated(AddGroup.class) @RequestBody ComActVO comActVO) {
R r = communityService.addCommunity(comActVO);
if (R.isOk(r)) {
- ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
+ ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
Long communityId = comActVO1.getCommunityId();
- AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
administratorsUserVO.setAccount(comActVO1.getAccount());
administratorsUserVO.setPassword(comActVO.getPassword());
administratorsUserVO.setPhone(comActVO1.getContactsPhone());
@@ -61,7 +61,7 @@
administratorsUserVO.setType(3);
administratorsUserVO.setAreaId(null);
administratorsUserVO.setCommunityId(communityId);
- administratorsUserVO.setStatus(comActVO1.getState()+1);
+ administratorsUserVO.setStatus(comActVO1.getState() + 1);
administratorsUserVO.setRoleId(999999999l);
administratorsUserVO.setUserId(this.getUserId());
R r1 = userService.addUserBackstage(administratorsUserVO);
@@ -75,34 +75,33 @@
@ApiOperation("编辑社区")
@PutMapping("community")
- @OperLog(operModul = "社区管理",operType = 2)
- public R putCommunity(@RequestBody ComActVO comActVO){
+ @OperLog(operModul = "社区管理", operType = 2)
+ public R putCommunity(@RequestBody ComActVO comActVO) {
Long communityId = comActVO.getCommunityId();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("社区主键不能为空");
}
return communityService.putCommunity(comActVO);
}
- @ApiOperation(value = "分页查询社区",response = ComActVO.class)
+ @ApiOperation(value = "分页查询社区", response = ComActVO.class)
@PostMapping("pagecommunity")
- public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){
+ public R pageCommunity(@RequestBody PageComActDTO pageComActDTO) {
return communityService.pageCommunity(pageComActDTO);
}
- @ApiOperation(value = "所在地地址下拉列表",response = ComMngStructAreaDistrictVO.class)
+ @ApiOperation(value = "所在地地址下拉列表", response = ComMngStructAreaDistrictVO.class)
@PostMapping("listarea")
- public R listArea(){
- Long cityAdcode=510400l;
- return communityService.listAreaDistrict(cityAdcode);
+ public R listArea() {
+ Long cityAdcode = 510400l;
+ return communityService.listAreaDistrict(cityAdcode);
}
- @ApiOperation(value = "社区详情",response = ComActVO.class)
+ @ApiOperation(value = "社区详情", response = ComActVO.class)
@GetMapping("community")
- public R detailCommunity(@RequestParam("id") Long id){
+ public R detailCommunity(@RequestParam("id") Long id) {
return communityService.detailCommunity(id);
}
-
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
index cac598b..e15f799 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
@@ -2,25 +2,21 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.interfaces.OperLog;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @description: 街道管理
@@ -35,27 +31,51 @@
@Resource
private UserService userService;
- @ApiOperation(value = "分页查询街道",response = PageComStreetDTO.class )
+ @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
@PostMapping("pagestreet")
- public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO){
+ public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
return communityService.pageStreet(pageComStreetDTO);
}
- @ApiOperation(value = "查询街道",response = ComStreetVO.class )
+ @ApiOperation(value = "查询街道", response = ComStreetVO.class)
@PostMapping("liststreet")
- public R listStreet(@RequestBody ComStreetVO comStreetVO){
- return communityService.listStreet(comStreetVO);
+ public R listStreet(@RequestBody ComStreetVO comStreetVO) {
+ R r = communityService.listStreet(comStreetVO);
+ return r;
}
- @ApiOperation(value = "新增街道",response = ComStreetVO.class )
+ @ApiOperation(value = "新增街道", response = ComStreetVO.class)
@PostMapping("addstreet")
- public R pageStreet(@RequestBody ComStreetVO comStreetVO){
- return communityService.pageStreet(comStreetVO);
+ public R pageStreet(@RequestBody ComStreetVO comStreetVO) {
+ R r = communityService.addStreet(comStreetVO);
+ if (R.isOk(r)) {
+ AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
+ administratorsUserVO.setAccount(comStreetVO.getAccount());
+ administratorsUserVO.setPassword(comStreetVO.getPassword());
+ administratorsUserVO.setType(4);
+ administratorsUserVO.setAreaId(null);
+ administratorsUserVO.setStatus(1);
+ administratorsUserVO.setRoleId(999999999l);
+ administratorsUserVO.setUserId(this.getUserId());
+ R r1 = userService.addUserBackstage(administratorsUserVO);
+ if (!R.isOk(r1)) {
+ ComStreetVO paramStreet = new ComStreetVO();
+ paramStreet.setProvinceCode(comStreetVO.getProvinceCode());
+ paramStreet.setCityCode(comStreetVO.getCityCode());
+ paramStreet.setAreaCode(comStreetVO.getAreaCode());
+ paramStreet.setName(comStreetVO.getName());
+ List<ComStreetVO> comStreetVOS = JSONObject.parseArray(JSONObject.toJSONString(r.getData()), ComStreetVO.class);
+ List<Long> streetIds = comStreetVOS.stream().map(ComStreetVO::getStreetId).collect(Collectors.toList());
+ communityService.delectStreat(streetIds);
+ }
+
+ }
+ return r;
}
@ApiOperation(value = "批量删除街道")
@PostMapping("deletestreet")
- public R pageStreet(@RequestBody List<Long> Ids){
+ public R pageStreet(@RequestBody List<Long> Ids) {
return communityService.delectStreat(Ids);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
index 0580a94..067b207 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -44,7 +44,7 @@
@Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空")
private Integer status;
- @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true)
+ @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台",hidden = true)
private Integer type;
@ApiModelProperty(value = "小区id",hidden = true)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index f80e559..bf10002 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1504,7 +1504,7 @@
* @return 新增结果
*/
@PostMapping("/addstreet")
- R pageStreet(@RequestBody ComStreetVO comStreetVOO);
+ R addStreet(@RequestBody ComStreetVO comStreetVOO);
/**
* 删除街道
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
index 1cc4178..17a626f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -47,7 +47,7 @@
public R addComMngCarApplet(ComMngCarAppletDTO comCvtBusinessDTO) {
int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>().lambda()
.eq(ComMngCarDO::getPlateNum, comCvtBusinessDTO.getPlateNum())
- .and(wrapper->wrapper.eq(ComMngCarDO::getSource,1)));
+ .and(wrapper -> wrapper.eq(ComMngCarDO::getSource, 1)));
if (count > 0) {
return R.ok("车辆已存在");
}
@@ -64,10 +64,10 @@
@Override
public R userComMngCarList(Long userId) {
List<ComMngCarVO> comMngCarVOS = new ArrayList<>();
- List<ComMngCarDO> carDOS = comMngCarDAO.selectList(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getUserId,userId));
- carDOS.forEach(carDO->{
+ List<ComMngCarDO> carDOS = comMngCarDAO.selectList(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getUserId, userId));
+ carDOS.forEach(carDO -> {
ComMngCarVO carVO = new ComMngCarVO();
- BeanUtils.copyProperties(carDO,carVO);
+ BeanUtils.copyProperties(carDO, carVO);
comMngCarVOS.add(carVO);
});
return R.ok(comMngCarVOS);
@@ -93,14 +93,14 @@
@Override
public R saveComMngCar(ComMngCarSaveDTO comMngCarSaveDTO) {
boolean carResult = ParamRegularUtil.carNumRegular(comMngCarSaveDTO.getPlateNum());
- if(!carResult){
+ if (!carResult) {
return R.fail("车牌号有误！");
}
- ComMngCarDO exist= comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>()
- .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()).and(wrapper->wrapper.eq(ComMngCarDO::getSource,2)));
- /*if (comMngCarSaveDTO.getId()!=0 && exist.getId()!=comMngCarSaveDTO.getId()) {
+ ComMngCarDO exist = comMngCarDAO.selectOne(new QueryWrapper<ComMngCarDO>()
+ .lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()));
+ if (exist != null) {
return R.ok("车辆已存在");
- }*/
+ }
ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(comMngCarSaveDTO.getAreaId());
if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
return R.fail("小区不存在");
@@ -115,16 +115,16 @@
comMngCarDO.setCreateAt(new Date());
comMngCarDO.setSource(2);
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(comMngCarSaveDTO.getMobile());
- if(R.isOk(sysUserVOR)){
- SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()),SysUserVO.class);
+ if (R.isOk(sysUserVOR)) {
+ SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()), SysUserVO.class);
comMngCarSaveDTO.setUserId(sysUserVO.getUserId());
}
- if(null!=comMngCarDO.getId() && comMngCarDO.getId()!=0){
+ if (null != comMngCarDO.getId() && comMngCarDO.getId() != 0) {
boolean update = this.updateById(comMngCarDO);
if (update) {
return R.ok();
}
- }else{
+ } else {
boolean insert = this.save(comMngCarDO);
if (insert) {
return R.ok();
@@ -136,7 +136,7 @@
@Override
public R deleteComMngCar(Long id) {
int delete = comMngCarDAO.deleteById(id);
- if (delete==0) {
+ if (delete == 0) {
return R.fail("车辆信息不存在");
}
return R.ok();
@@ -145,23 +145,23 @@
@Override
public R listSaveMngCarExcelVO(List<ComMngCarExcelVO> list, Long communityId) {
//获取社区下所有的小区
- List<ComMngStructAreaDO> comMngStructAreaDOs = comMngStructAreaDAO.selectList(new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId,communityId));
- Map<String,ComMngStructAreaDO> areaMap = new HashMap<>(comMngStructAreaDOs.size());
- comMngStructAreaDOs.forEach(comMngStructAreaDO->{
- areaMap.put(comMngStructAreaDO.getAreaName(),comMngStructAreaDO);
+ List<ComMngStructAreaDO> comMngStructAreaDOs = comMngStructAreaDAO.selectList(new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId, communityId));
+ Map<String, ComMngStructAreaDO> areaMap = new HashMap<>(comMngStructAreaDOs.size());
+ comMngStructAreaDOs.forEach(comMngStructAreaDO -> {
+ areaMap.put(comMngStructAreaDO.getAreaName(), comMngStructAreaDO);
});
List<ComMngCarDO> comMngCarDOS = new ArrayList<>();
- list.forEach(vo->{
+ list.forEach(vo -> {
int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>()
- .lambda().eq(ComMngCarDO::getPlateNum, vo.getPlateNum()).and(wrapper->wrapper.eq(ComMngCarDO::getSource,2)));
- if(count==0 && areaMap.containsKey(vo.getAreaName())){
+ .lambda().eq(ComMngCarDO::getPlateNum, vo.getPlateNum()).and(wrapper -> wrapper.eq(ComMngCarDO::getSource, 2)));
+ if (count == 0 && areaMap.containsKey(vo.getAreaName())) {
ComMngCarDO comMngCarDO = new ComMngCarDO();
- BeanUtils.copyProperties(vo,comMngCarDO);
+ BeanUtils.copyProperties(vo, comMngCarDO);
comMngCarDO.setCommunityId(communityId);
comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getId());
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(vo.getMobile());
- if(R.isOk(sysUserVOR)){
- SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()),SysUserVO.class);
+ if (R.isOk(sysUserVOR)) {
+ SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()), SysUserVO.class);
comMngCarDO.setUserId(sysUserVO.getUserId());
}
comMngCarDO.setSource(2);
@@ -169,6 +169,6 @@
}
});
this.saveBatch(comMngCarDOS);
- return R.ok("共计导入车辆数量："+comMngCarDOS.size());
+ return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 9960566..0770984 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -13,9 +13,11 @@
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComActDiscussDO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngVillageService;
import org.springframework.beans.BeanUtils;
@@ -38,6 +40,8 @@
ComActVillageDAO comActVillageDAO;
@Resource
ComActDAO comActDAO;
+ @Resource
+ ComMngPopulationDAO populationDAO;
@Override
public R addComActVillage(ComMngVillageVO comMngVillageVO) {
@@ -100,6 +104,12 @@
@Override
public R delecComActVillage(List<Long> Ids) {
+ LambdaQueryWrapper<ComMngPopulationDO> paramWrapper = Wrappers.lambdaQuery();
+ paramWrapper.in(ComMngPopulationDO::getVillageId, Ids);
+ ComMngPopulationDO mngPopulationDO = populationDAO.selectOne(paramWrapper);
+ if (mngPopulationDO != null) {
+ return R.fail("无法删除，已绑定实有人口!");
+ }
int delete = comActVillageDAO.deleteBatchIds(Ids);
if (delete > 0) {
return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
index 3c10076..13c290d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
@@ -52,7 +52,7 @@
@Override
public R getJumpContent() {
List<ComOpsAdvJumpVO> comOpsAdvJumpVOS=new ArrayList<>();
- List<ComOpsAdvJumpDO> comOpsAdvJumpDOS = comOpsAdvJumpDAO.selectList(null);
+ List<ComOpsAdvJumpDO> comOpsAdvJumpDOS = comOpsAdvJumpDAO.selectList(new QueryWrapper<>());
if (!ObjectUtils.isEmpty(comOpsAdvJumpDOS)) {
comOpsAdvJumpDOS.forEach(comOpsAdvJumpDO -> {
ComOpsAdvJumpVO comOpsAdvJumpVO=new ComOpsAdvJumpVO();
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 882d812..20bd18e 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
@@ -21,6 +21,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -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);
}
/**
@@ -138,6 +145,7 @@
/**
* 批量删除街道
+ *
* @param streetIds 社区id
* @return 删除结果
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
index 779db07..d1b58f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -41,15 +41,15 @@
"c.name communityName\n" +
"from sys_user_feedback f\n" +
"join sys_user u on f.user_id=u.user_id\n" +
- "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != ""'>" +
- "and u.name=#{pageFeedBackDTO.name}\n" +
- " </if> " +
- "<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != ""'>" +
- "and u.nick_name=#{pageFeedBackDTO.nickName}\n" +
- " </if> " +
"<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != ""'>" +
"and u.phone=#{pageFeedBackDTO.phone}\n" +
" </if> " +
+ "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != ""'>" +
+ "and u.name like concat('%',#{pageFeedBackDTO.name},'%') \n" +
+ " </if> " +
+ "<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != ""'>" +
+ "and u.nick_name=like concat('%',#{pageFeedBackDTO.nickName},'%') \n" +
+ " </if> " +
"join com_act c on u.community_id=c.community_id\n" +
"order by f.create_at desc\n" +
"</script>")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 448ea90..e30a69d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -741,7 +741,7 @@
Long roleId = administratorsUserVO.getRoleId();
Long communityId = administratorsUserVO.getCommunityId();
if (roleId.intValue()==999999999) {
-//新增社区高级管理员角色
+ //新增社区高级管理员角色
SysRoleDO sysRoleDO=new SysRoleDO();
sysRoleDO.setCommunityId(communityId);
sysRoleDO.setRoleName("超级管理员");
@@ -752,7 +752,7 @@
if (insert>0) {
SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
roleId=sysRoleDO1.getRoleId();
-// 新角色设置所有权限
+ //新角色设置所有权限
MenuRoleVO menuRoleVO=new MenuRoleVO();
menuRoleVO.setIsAll(1);
menuRoleVO.setCommunityId(communityId);
@@ -781,7 +781,7 @@
}
if (insert>0) {
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
Long userId = sysUserDO1.getUserId();
SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
sysUserRoleDO.setUserId(userId);
--
Gitblit v1.7.1