From 307fbfe65a2436954e377531f7c07e2a566ad53e Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 02 二月 2024 11:31:17 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 7 +++++++
ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java | 12 ++++++++++++
ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java | 5 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 15 ++++++---------
5 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 7399842..21550e1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1384,6 +1384,13 @@
}
+ @GetMapping("/deptTree111")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
+ public AjaxResult deptTree111(SysDept dept) {
+ return success(deptService.selectDeptTreeList1(dept));
+ }
+
+
/**
* 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
*/
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 04ad056..0f42f64 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
+import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
@@ -61,6 +62,8 @@
private ITjRulesService tjRulesService;
@Resource
private TestMapper testMapper;
+ @Resource
+ private RedisCache redisCache;
@GetMapping("/getTjHyBgList")
@@ -87,19 +90,13 @@
if (tjProjects != null) {
for (TjProject project : tjProjects) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId, project.getProId());
- if(null !=proName) {
- wq1.like(TjProject::getProName, proName);
- }
- List<TjProject> projectList = tjProjectService.list(wq1);
- project.setTjProjectList(projectList);
-
-
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+ project.setTjProjectList(projectList);
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
if (sysDept!=null){
project.setDeptName(sysDept.getDeptName());
}
+
}
}
String key = configService.selectConfigByKey("is_open_sfxm");
diff --git a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
index e82742f..065cbc3 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
@@ -5,6 +5,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.common.core.domain.TreeSelect;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.ltkj.common.core.domain.entity.SysDept;
@@ -25,6 +26,10 @@
*/
public List<SysDept> selectDeptList(SysDept dept);
+
+ @Select("SELECT * FROM v_tj_deptpro")
+ public List<SysDept> selectDeptTreeList1();
+
/**
* 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭�
*
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
index a29a82b..b55c610 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
@@ -22,6 +22,7 @@
* @return 閮ㄩ棬淇℃伅闆嗗悎
*/
public List<SysDept> selectDeptList(SysDept dept);
+ public List<SysDept> selectDeptList11(SysDept dept);
/**
* 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
@@ -31,6 +32,8 @@
*/
public List<TreeSelect> selectDeptTreeList(SysDept dept);
+ public List<TreeSelect> selectDeptTreeList1(SysDept dept);
+
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
*
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
index 5010e8b..77f18ee 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
@@ -50,6 +50,12 @@
return deptMapper.selectDeptList(dept);
}
+ @Override
+ @DataScope(deptAlias = "d")
+ public List<SysDept> selectDeptList11(SysDept dept) {
+ return deptMapper.selectDeptTreeList1();
+ }
+
/**
* 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
*
@@ -62,6 +68,12 @@
return buildDeptTreeSelect(depts);
}
+ @Override
+ public List<TreeSelect> selectDeptTreeList1(SysDept dept) {
+ List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList11(dept);
+ return buildDeptTreeSelect(depts);
+ }
+
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
*
--
Gitblit v1.8.0