From adaaa23c789be3313a0e554fbf7beaa8ab261e68 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 16 五月 2024 18:07:01 +0800
Subject: [PATCH] zjh 2024/05/16-1

---
 ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 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 793e94d..37f2ec2 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,18 @@
         return deptMapper.selectDeptList(dept);
     }
 
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptList11(SysDept dept) {
+        return deptMapper.selectDeptTreeList1();
+    }
+
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptList111(SysDept dept) {
+        return deptMapper.selectDeptTreeList11();
+    }
+
     /**
      * 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
      *
@@ -59,6 +71,12 @@
     @Override
     public List<TreeSelect> selectDeptTreeList(SysDept dept) {
         List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
+    @Override
+    public List<TreeSelect> selectDeptTreeList1(SysDept dept) {
+        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList11(dept);
         return buildDeptTreeSelect(depts);
     }
 
@@ -199,7 +217,6 @@
      */
     @Override
     public int insertDept(SysDept dept) {
-        // TODO: 2023/2/17  鏂板閮ㄩ棬 鏃跺�欐煡鐪嬬埗椤�
         Long parentId = dept.getParentId();
         if(null ==parentId){
             parentId=100L;
@@ -394,4 +411,27 @@
         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);
+    }
 }

--
Gitblit v1.8.0