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 d802020d..e3007e7f 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
@@ -72,6 +72,45 @@ public class AppEnforcementRegistrationController extends BaseController
     public ZDResponse selectList(EnforcementRegistration enforcementRegistration)
     {
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
+        DictDataBean dictParams = new DictDataBean();
+        dictParams.setDictType("check_category");
+        List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
+        for (EnforcementRegistration ee : list) {
+            // 判断是否投诉
+            EnterpriseComplaint params = new EnterpriseComplaint();
+            params.setRelId(ee.getId());
+            params.setComOrOpi(1);
+            List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
+            if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
+                ee.setComOrOpi(1);
+            } else {
+                ee.setComOrOpi(0);
+            }
+
+            // 执法类别
+            for (DictDataBean dict : dicts) {
+                if (dict.getDictValue().equals(ee.getCheckCategory())) {
+                    ee.setCheckCategoryText(dict.getDictLabel());
+                }
+            }
+
+            // 执法人员1需要展示用户名+执法码
+            UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
+            String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
+            ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
+            // 执法人员2需要展示用户名+执法码
+            List<String> lawTwoList = new ArrayList<>();
+            List<UserBean> userBeans = new ArrayList<>();
+            if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
+                userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
+            }
+            for (UserBean ub : userBeans) {
+                String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
+                lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
+            }
+            ee.setLawEnforcer2List(lawTwoList);
+        }
+
         return ZDResponse.success("获取执法登录信息",list);
     }
 
@@ -182,10 +221,8 @@ public class AppEnforcementRegistrationController extends BaseController
             if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
                 userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
             }
-//            String tmpUserShow = "";
             for (UserBean ub : userBeans) {
                 String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
-//                tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
                 lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
             }
             ee.setLawEnforcer2List(lawTwoList);