From c2ea02407c76560111e2a149a4a057c257c01052 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 06 Jun 2024 17:39:48 +0800
Subject: [PATCH] 删除场所空指针
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 49f0ab7..c144e79 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
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
@@ -28,6 +29,7 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
@@ -42,13 +44,13 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.ExportPlaceExcel;
+import org.springblade.modules.place.excel.ImportPlaceExcel;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
-import org.springblade.modules.place.excel.ImportPlaceExcel;
+import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.*;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
-import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.DictBiz;
@@ -59,7 +61,6 @@
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -1492,6 +1493,9 @@
PlaceEntity placeEntity = getById(id);
if (null != placeEntity.getPrincipalUserId()) {
User user = userService.getById(placeEntity.getPrincipalUserId());
+ if (ObjectUtil.isEmpty(user)) {
+ return;
+ }
// 查询场所判断是否还绑定有其他的场所
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted", 0).eq("principal_user_id", user.getId());
--
Gitblit v1.9.3