From d0b0e00e40226700a0ffa1f1671a8dc273610f67 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 18 Dec 2023 14:28:10 +0800
Subject: [PATCH] 菜单分类优化
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 070d0b2..68aac06 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -31,7 +31,6 @@
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.entity.UserDept;
import org.springblade.modules.system.mapper.DeptMapper;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
@@ -201,16 +200,16 @@
queryWrapper.eq("is_deleted",0).eq("id", dept.getParentId());
Dept parentDept = getOne(queryWrapper);
// 如果父机构为物业公司
- if (parentDept.getDeptName().equals("物业公司")){
+ if (parentDept != null && parentDept.getDeptName().equals("物业公司")) {
// 查询当前
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0)
- .eq("dept_name",dept.getDeptName());
+ wrapper.eq("is_deleted", 0)
+ .eq("dept_name", dept.getDeptName());
Dept one = getOne(wrapper);
- if (null!=one){
+ if (null != one) {
dept.setId(one.getId());
flag = updateById(dept);
- }else {
+ } else {
flag = save(dept);
}
//保存物业公司信息
--
Gitblit v1.9.3