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 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 result = new HashMap<>(); result.put("regResults", regResults); result.put("lawResults", lawResults);