From 6d529f8af3d52a02f04097218d7c17fffd93d49c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 29 四月 2025 18:05:27 +0800
Subject: [PATCH] zjh20250429

---
 ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 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 c26004c..b192444 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
@@ -396,36 +396,41 @@
         map.put("page",page);
         map.put("pageSize",pageSize);
         List<List<?>> list = deptMapper.getSysDeptYjWjCustomerList13(map);
-//        ObjectMapper objectMapper=new ObjectMapper();
-//        try {
-//            System.out.println("缁撴灉闆嗕竴锛�"+objectMapper.writeValueAsString(list.get(0)));
-//            System.out.println("缁撴灉闆嗕簩锛�"+objectMapper.writeValueAsString(list.get(1)));
-//        } catch (JsonProcessingException e) {
-//            e.printStackTrace();
-//        }
-//        System.out.println("鍑哄弬鍙傛暟鍊硷細"+map.get("totalRows"));
         Map<String,Object> map1=new HashMap<>();
         map1.put("date",list);
         map1.put("total",map.get("totalRows"));
 
         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) {
+    public Map<String, Object> getSysDeptHyAndYxYjWjCustomerList13(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);
+        map.put("totalRows", null);
         List<List<?>> list = deptMapper.getSysDeptHyAndYxYjWjCustomerList13(map);
+        // 鑾峰彇 OUT 鍙傛暟
         Map<String,Object> map1=new HashMap<>();
         map1.put("date",list);
         map1.put("total",map.get("totalRows"));
 
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("deptid","100");
+//        map.put("tjname",tjname);
+//        map.put("tjNumber",tjNumber);
+//        map.put("type",type);
+//        map.put("page",page);
+//        map.put("pageSize",pageSize);
+//        List<List<?>> list = deptMapper.getSysDeptYjWjCustomerList13(map);
+//        Map<String,Object> map1=new HashMap<>();
+//        map1.put("date",list);
+//        map1.put("total",map.get("totalRows"));
+
+
         return   map1 ;
     }
 

--
Gitblit v1.8.0