diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java
index 8eb3e8bf..9f41aa9f 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseLawEnforcementMapper.java
@@ -19,6 +19,7 @@ public interface EnterpriseLawEnforcementMapper
      * @return 企业端-执法部门预约记录
      */
     public EnterpriseLawEnforcement selectEnterpriseLawEnforcementById(String id);
+    public List<EnterpriseLawEnforcement> selectEnterpriseLawEnforcementByUniteCheck(String id);
     public int countEnterprise(EnterpriseLawEnforcement enterpriseLawEnforcement);
 
     /**
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 e13f8600..947e1b6d 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
@@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
+import com.zdxt.code.domain.EnforcementRegistration;
 import com.zdxt.code.domain.EnterpriseMerchantAuthorization;
 import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService;
@@ -59,6 +60,29 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     {
         EnterpriseLawEnforcement enterpriseLawEnforcement =
                 enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id);
+
+        // 通过联合执法的批次id获取整个批次的联合执法 - 用来处理执法部门
+        List<EnterpriseLawEnforcement> lawUnites = new ArrayList<>();
+        if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getUniteCheck())) {
+            // 已登记联合检查
+            lawUnites = enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementByUniteCheck(enterpriseLawEnforcement.getUniteCheck());
+        } else {
+            lawUnites.add(enterpriseLawEnforcement);
+        }
+        String bureauDeptName = "", bureauDeptId = "";
+        for (EnterpriseLawEnforcement tmp : lawUnites) {
+            bureauDeptName += tmp.getBureauDeptName() +",";
+            bureauDeptId += tmp.getBureauDeptId() +",";
+        }
+        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);
+
         // 执法人员1需要展示执法码
         if(enterpriseLawEnforcement.getLawEnforcerId() != null){
             UserBean user = userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId()));
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
index ef4c3288..4caba363 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
@@ -182,6 +182,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectEnterpriseLawEnforcementByUniteCheck" parameterType="String" resultMap="EnterpriseLawEnforcementResult">
+        <include refid="selectEnterpriseLawEnforcementVo"/>
+        where unite_check = #{id}
+    </select>
+
     <select id="countEnterprise" parameterType="EnterpriseLawEnforcement" resultType="int">
         select count(1) from enterprise_law_enforcement
         <where>