From 4ec472d8828e34fbcfb3990451d059e486b7d5ea Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 17 Jan 2024 19:32:46 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 29f0e11..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,18 +19,22 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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;
+import org.springblade.core.secure.utils.AuthUtil;
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.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
import org.springblade.modules.system.mapper.RegionMapper;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.vo.RegionVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -46,6 +50,9 @@
*/
@Service
public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService {
+
+ @Autowired
+ private IDeptService deptService;
@Override
public boolean submit(Region region) {
@@ -122,11 +129,45 @@
/**
* 树列表
- * @param parentCode
+ *
+ * @param region
* @return
*/
@Override
- public List<TreeStringNode> getTree(String parentCode) {
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(parentCode));
+ public List<TreeStringNode> getTree(RegionVO region) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ region.setRegionCode(dept.getRegionCode());
+ }
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
+ }
+
+ /**
+ * 树列表(获取当前树）
+ *
+ * @param code
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getTownTree(String code) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ String regionCode = null;
+ if (null != dept) {
+ regionCode = dept.getRegionCode();
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("3611")) {
+ regionCode = "361102";
+ }
+ }
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
+ }
+
+ /**
+ * 树列表(包含省市县三级)
+ *
+ * @return
+ */
+ @Override
+ public List<TreeStringNode> getBaseTree() {
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getBaseTree());
}
}
--
Gitblit v1.9.3