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/service/impl/SysDeptServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
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 77f18ee..f215d8b 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
@@ -56,6 +56,12 @@
return deptMapper.selectDeptTreeList1();
}
+ @Override
+ @DataScope(deptAlias = "d")
+ public List<SysDept> selectDeptList111(SysDept dept) {
+ return deptMapper.selectDeptTreeList11();
+ }
+
/**
* 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
*
@@ -405,4 +411,52 @@
return map1 ;
// return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize);
}
+
+ @Override
+ public Map<String, Object> getSysDeptHyAndYxYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("deptid",deptid);
+ map.put("tjname",tjname);
+ map.put("tjNumber",tjNumber);
+ map.put("type",type);
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ List<List<?>> list = deptMapper.getSysDeptHyAndYxYjWjCustomerList13(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("date",list);
+ map1.put("total",map.get("totalRows"));
+
+ return map1 ;
+ }
+
+ @Override
+ public List<TreeSelect> selectDeptList1(SysDept dept) {
+ List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList111(dept);
+ return buildDeptTreeSelect(depts);
+ }
+
+ @Override
+ public List<String> getJyDeptIds() {
+ return deptMapper.getJyDeptIds();
+ }
+
+ @Override
+ public List<String> getJcDeptIds() {
+ return deptMapper.getJcDeptIds();
+ }
+
+ @Override
+ public List<String> getCzDeptIds() {
+ return deptMapper.getCzDeptIds();
+ }
+
+ @Override
+ public String getprentks(String deptId) {
+ return deptMapper.getprentks(deptId);
+ }
+
+ @Override
+ public List<Long> getDeptTreeById(String deptId) {
+ return deptMapper.getDeptTreeById(deptId);
+ }
}
--
Gitblit v1.8.0