From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index dd4835d..23e49e2 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -731,6 +731,8 @@
placeExtEntity.setUpdateUser(AuthUtil.getUserId());
// 新增场所详情
placeExtService.save(placeExtEntity);
+ } else {
+ placeExtService.updateById(placeVO.getPlaceExtEntity());
}
}
@@ -985,9 +987,9 @@
placeRelEntity.setPlaceId(placeEntity.getId());
placeRelEntity.setStreetName(placeExcel.getStreetName());
QueryWrapper<Region> wrapper = new QueryWrapper<>();
- wrapper.eq("name",placeExcel.getCommunityName());
+ wrapper.eq("name", placeExcel.getCommunityName());
Region region = SpringUtils.getBean(IRegionService.class).getOne(wrapper);
- if (null!=region){
+ if (null != region) {
placeRelEntity.setCommunityCode(region.getCode());
}
placeRelEntity.setCommunityName(placeExcel.getCommunityName());
@@ -1031,10 +1033,10 @@
if (!Strings.isBlank(placeExcel.getLabelCode())) {
// 匹配标签
QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("level",3).eq("category_name",placeExcel.getLabelCode()).eq("is_deleted",0);
+ wrapper.eq("level", 3).eq("category_name", placeExcel.getLabelCode()).eq("is_deleted", 0);
// 查询
List<CategoryEntity> list = SpringUtils.getBean(ICategoryService.class).list(wrapper);
- if (list.size()>0){
+ if (list.size() > 0) {
PlaceVO placeVO = new PlaceVO();
CategoryEntity categoryEntity = list.get(0);
placeVO.setLabel(categoryEntity.getCategoryNo());
--
Gitblit v1.9.3