From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
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 755b73d..70b0f8d 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;
@@ -24,6 +25,13 @@
* @return 閮ㄩ棬淇℃伅闆嗗悎
*/
public List<SysDept> selectDeptList(SysDept dept);
+
+
+ @Select("SELECT * FROM v_tj_deptpro")
+ public List<SysDept> selectDeptTreeList1();
+
+ @Select("SELECT * FROM v_dept_template")
+ public List<SysDept> selectDeptTreeList11();
/**
* 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭�
@@ -131,5 +139,25 @@
@Param("type")int type, @Param("page") int page , @Param("pageSize") int pageSize);
List<Map<String, Object>> getSysDeptYjWjCustomerList1(Map<String,Object> map);
+
+ List<List<?>> getSysDeptYjWjCustomerList13(Map<String,Object> map);
+
+ List<List<?>> getSysDeptHyAndYxYjWjCustomerList13(Map<String,Object> map);
+
List<ResultSet> getSysDeptYjWjCustomerList2(Map<String,Object> map);
+
+
+ @Select("SELECT a.dept_id FROM sys_dept a WHERE a.deleted=0 AND a.`status`=0 AND a.org_type=1")
+ List<String> getJyDeptIds();
+
+ @Select("SELECT a.dept_id FROM sys_dept a WHERE a.deleted=0 AND a.`status`=0 AND a.org_type=2")
+ List<String> getJcDeptIds();
+
+ @Select("SELECT a.dept_id FROM sys_dept a WHERE a.deleted=0 AND a.`status`=0 AND a.org_type=3")
+ List<String> getCzDeptIds();
+
+ @Select("SELECT e.dept_name FROM sys_dept e WHERE e.dept_id=#{deptId}")
+ String getprentks(String deptId);
+
+ List<Long> getDeptTreeById(@Param("deptId") String deptId);
}
--
Gitblit v1.8.0