From ac544c1d85c53e7f51e4ea76aa2489a14aef03d9 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 20 六月 2025 18:57:45 +0800 Subject: [PATCH] zjh20250620 --- ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java | 32 +++++++++++++++++++++----------- 1 files changed, 21 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..7a0885f 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,35 +396,40 @@ 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 ; } @@ -454,4 +459,9 @@ public String getprentks(String deptId) { return deptMapper.getprentks(deptId); } + + @Override + public List<Long> getDeptTreeById(String deptId) { + return deptMapper.getDeptTreeById(deptId); + } } -- Gitblit v1.8.0