From 2ad2b14ea01dc47cdf6d1364a76f48ba7102712d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 16 Jan 2024 17:02:38 +0800
Subject: [PATCH] 物业评分题目
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index 5cb29d9..2c3709b 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -19,8 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.logging.log4j.util.Strings;
-import org.springblade.common.node.TreeLongNode;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.log.exception.ServiceException;
@@ -28,7 +27,6 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
-import org.springblade.modules.district.vo.DistrictVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
@@ -131,13 +129,14 @@
/**
* 树列表
+ *
* @param region
* @return
*/
@Override
public List<TreeStringNode> getTree(RegionVO region) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
+ if (null != dept) {
region.setRegionCode(dept.getRegionCode());
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
@@ -145,6 +144,7 @@
/**
* 树列表(获取当前树）
+ *
* @param code
* @return
*/
@@ -152,9 +152,9 @@
public List<TreeStringNode> getTownTree(String code) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
String regionCode = null;
- if (null!=dept){
+ if (null != dept) {
regionCode = dept.getRegionCode();
- if (regionCode.equals("3611")){
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("3611")) {
regionCode = "361102";
}
}
@@ -163,6 +163,7 @@
/**
* 树列表(包含省市县三级)
+ *
* @return
*/
@Override
--
Gitblit v1.9.3