From 3c162a10f92218e10277a58ff87fb4f7fd166d6a Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 27 Sep 2024 17:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E8=AF=A6=E6=83=85,=20?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=A1=E6=81=AF=E6=89=A7=E6=B3=95=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnforcementRegistrationController.java | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
index 76fe7fc1..9d02b8b5 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
@@ -601,6 +601,28 @@ public class AppEnforcementRegistrationController extends BaseController
 //            }
             reg.setEnterpriseEvaluate(enterpriseEvaluate);
         }
+
+        for (EnterpriseLawEnforcement law : lawResults) {
+            // 执法人员1需要展示用户名+执法码
+            UserBean userBean = userApi.getUserByUserId(Long.valueOf(law.getLawEnforcerId()));
+            String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum()) ? "" : userBean.getLawCertificateNum();
+            law.setLawEnforcer(userBean.getUserName() + " " + lawCN);
+
+            // 执法人员2需要展示用户名+执法码
+            List<UserBean> userBeans = new ArrayList<>();
+            if (StringUtils.isNotEmpty(law.getLawEnforcerTwoId())) {
+                userBeans = userApi.getUserByUserIds(law.getLawEnforcerTwoId());
+            }
+            String tmpUserShow = "";
+            for (UserBean ub : userBeans) {
+                String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum()) ? "" : ub.getLawCertificateNum();
+                tmpUserShow += ub.getUserName() + " " + lawCertificateNum + ",";
+            }
+            if (tmpUserShow.length() > 0) {
+                tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length() - 1);
+            }
+            law.setLawEnforcer2Show(tmpUserShow);
+        }
         Map<String, List> result = new HashMap<>();
         result.put("regResults", regResults);
         result.put("lawResults", lawResults);