From 734884b3ff9d80991745870aa719166e1ac51c40 Mon Sep 17 00:00:00 2001 From: yanyan Date: Mon, 14 Jul 2025 09:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=83=A8=E9=97=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dept/mapper/DeptMapper.java | 2 +- .../resources/mapper/system/DeptMapper.xml | 6 +- .../impl/Zfztjdm111915ServiceImpl.java | 60 +++++++++++++++---- .../resources/mapper/Zfryjdm2405301Mapper.xml | 6 ++ 4 files changed, 61 insertions(+), 13 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java index d65e55e4..1fe667d9 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java @@ -62,7 +62,7 @@ public interface DeptMapper */ List selectDeptList(Dept dept); - List selectDeptByZone(); + List selectDeptByZone(Dept dept); /** * 根据部门信息获取当前及一下所有部门(下钻) diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml index f85bf493..25e47401 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -44,6 +44,7 @@ + @@ -190,11 +191,14 @@ - where d.del_flag = '0' and d.zone is not null and d.zone != 2 + + ${params.dataScope} + order by d.parent_id, d.order_num diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java index 0e17139a..2137c373 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java @@ -13,10 +13,8 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; +import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; @Service @@ -43,11 +41,32 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service { @DataScope(deptField = "d.dept_id") public List getDeptStaticList(Zfryjdm2405301 zfryjdm2405301) { // int totalNumber=0; + //List zfztjdm111915List = new ArrayList<>(); + //List zfztjdm111915List = zfztjdm111915Mapper.selectZfztjdmListAndDeptScope(zfryjdm2405301); List zfztjdm111915List = zfztjdm111915Mapper.selectZfztjdmListAndDeptScope(zfryjdm2405301); - List depts = deptMapper.selectDeptByZone(); + Map map = zfztjdm111915List.stream() + .collect(Collectors.toMap( + Zfztjdm111915::getDeptId, + Function.identity(), + (v1, v2) -> v2 // 键冲突时保留新值 + )); + Dept dept1 = new Dept(); + dept1.setParams(zfryjdm2405301.getParams()); + List depts = deptMapper.selectDeptByZone(dept1); if (CollectionUtils.isEmpty(depts)) return new ArrayList<>(); - HashSet collect = depts.stream().map(Dept::getDeptId).collect(Collectors.toCollection(HashSet::new)); - zfztjdm111915List = zfztjdm111915List.stream().filter(i -> collect.contains(i.getDeptId())).collect(Collectors.toList()); + for (Dept dept : depts) { + Zfztjdm111915 zfztjdm111915 = new Zfztjdm111915(); + zfztjdm111915.setDeptId(dept.getDeptId()); + zfztjdm111915.setSubName(dept.getName()); + zfztjdm111915.setCode(dept.getCreditcode()); + if (map.containsKey(dept.getDeptId())) { + Zfztjdm111915 value = map.get(dept.getDeptId()); + zfztjdm111915.setCode(value!=null?value.getCode():null); + } + zfztjdm111915List.add(zfztjdm111915); + } + //HashSet collect = depts.stream().map(Dept::getDeptId).collect(Collectors.toCollection(HashSet::new)); + //zfztjdm111915List = zfztjdm111915List.stream().filter(i -> collect.contains(i.getDeptId())).collect(Collectors.toList()); // Map zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity())); List hasList=new ArrayList<>(); List zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupBy(zfryjdm2405301); @@ -70,14 +89,32 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service { } } @Override - @DataScope + @DataScope(deptField = "d.dept_id") public int getZFRYNumber(Zfryjdm2405301 zfryjdm2405301) { int totalNumber=0; + //List zfztjdm111915List = new ArrayList<>(); List zfztjdm111915List = zfztjdm111915Mapper.selectZfztjdmListAndDeptScope(zfryjdm2405301); - List depts = deptMapper.selectDeptByZone(); + Map map = zfztjdm111915List.stream() + .collect(Collectors.toMap( + Zfztjdm111915::getDeptId, + Function.identity(), + (v1, v2) -> v2 // 键冲突时保留新值 + )); + Dept dept1 = new Dept(); + dept1.setParams(zfryjdm2405301.getParams()); + List depts = deptMapper.selectDeptByZone(dept1); if (CollectionUtils.isEmpty(depts)) return 0; - HashSet collect = depts.stream().map(Dept::getDeptId).collect(Collectors.toCollection(HashSet::new)); - zfztjdm111915List = zfztjdm111915List.stream().filter(i -> collect.contains(i.getDeptId())).collect(Collectors.toList()); + for (Dept dept : depts) { + Zfztjdm111915 zfztjdm111915 = new Zfztjdm111915(); + zfztjdm111915.setDeptId(dept.getDeptId()); + zfztjdm111915.setSubName(dept.getName()); + zfztjdm111915.setCode(dept.getCreditcode()); + if (map.containsKey(dept.getDeptId())) { + Zfztjdm111915 value = map.get(dept.getDeptId()); + zfztjdm111915.setCode(value!=null?value.getCode():null); + } + zfztjdm111915List.add(zfztjdm111915); + } // Map zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity())); List zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupBy(zfryjdm2405301); for (int i = 0; i < zfztjdm111915List.size(); i++) { @@ -98,6 +135,7 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service { } @Override + @DataScope(deptField = "x.dept_id") public List export(Zfryjdm2405301 zfryjdm2405301) { List zfztjdm111915List = this.selectZfztjdmListAndDept(zfryjdm2405301.getZfdw()); List hasList=new ArrayList<>(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml index 95e76b11..3a31830d 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml @@ -73,6 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by z.sfzcode_encrypt)x left join (select dept_id,ancestors,creditcode from sys_dept where status='0' and del_flag='0') d on x.dept_id=d.dept_id + + + + ${params.dataScope} + + order by zzjgdm