From 7eeebb6a43865d6abf7be973eee2c322d42e7504 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 20 Sep 2024 18:31:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF,=20=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E8=AF=A6=E6=83=85,=20=E9=83=A8=E9=97=A8=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseLawEnforcementServiceImpl.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 947e1b6d..bc2ebe2d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -1,7 +1,9 @@ package com.zdxt.code.service.impl; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; @@ -69,19 +71,14 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc } else { lawUnites.add(enterpriseLawEnforcement); } - String bureauDeptName = "", bureauDeptId = ""; + Set bureauDeptNames = new HashSet(); + Set bureauDeptIds = new HashSet(); for (EnterpriseLawEnforcement tmp : lawUnites) { - bureauDeptName += tmp.getBureauDeptName() +","; - bureauDeptId += tmp.getBureauDeptId() +","; + bureauDeptNames.add(tmp.getLawEnforcement()); + bureauDeptIds.add(tmp.getLawEnforcementId()); } - if(!bureauDeptName.equals("")){ - bureauDeptName = bureauDeptName.substring(0,bureauDeptName.length()-1); - } - if(!bureauDeptId.equals("")){ - bureauDeptId = bureauDeptId.substring(0,bureauDeptId.length()-1); - } - enterpriseLawEnforcement.setBureauDeptName(bureauDeptName); - enterpriseLawEnforcement.setBureauDeptId(bureauDeptId); + enterpriseLawEnforcement.setBureauDeptName(String.join(",", bureauDeptNames)); + enterpriseLawEnforcement.setBureauDeptId(String.join(",", bureauDeptIds)); // 执法人员1需要展示执法码 if(enterpriseLawEnforcement.getLawEnforcerId() != null){