diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
index 6c9ea3c7..57dd0a12 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
@@ -183,6 +183,7 @@ public class EnforcementRegistration extends BaseDomain
     /** 是否牵头单位 */
     private int uniteType;
 
+
     public String getDeptQx() {
         return deptQx;
     }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
index 72f0b76b..103a50c9 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
@@ -53,6 +53,23 @@ public class StatisticsIndicatorPart extends BaseDomain {
     private String beginTime;
     private String endTime;
 
+
+    /**
+     * 是否全部数据权限
+     */
+    private String isAllData;
+    /**
+     * 区 搜索条件
+     */
+    private String region;
+    /**
+     * 街道 搜索条件
+     */
+    private String street;
+
+
+
+
     public String getName() {
         return name;
     }
@@ -180,4 +197,28 @@ public class StatisticsIndicatorPart extends BaseDomain {
     public void setHuanValue(Double huanValue) {
         this.huanValue = huanValue;
     }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getIsAllData() {
+        return isAllData;
+    }
+
+    public void setIsAllData(String isAllData) {
+        this.isAllData = isAllData;
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
index b0c25394..c6fd4bab 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
@@ -380,6 +380,7 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
     @DataScope
     @Override
     public StatisticsIndicatorPart registrationNew(StatisticsIndicatorPart statisticsIndicatorPart) {
+
         //获取当前用户所在执法部门ID
         String deptId = takeDeptId();
         //获取当前部门执法数据
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 191add42..0be63a41 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -154,59 +154,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by enforcement_time desc
     </select>
     <select id="selectEnforcementRegistrationList1" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
-    <include refid="selectEnforcementRegistrationVo"/>
-    <where>
-        and bureau_dept_name is not null
-        and law_enforcement_id is not null
-        and enterprise_name is not null
-        and enterprise_number is not null
-        and law_enforcer is not null
-        and law_enforcer_two is not null
-        and is_complaint is not null
-        and check_category is not null
-        and bureau_dept_id is not null
-        <if test="deptQx != null  and deptQx != ''">and bureau_dept_id =#{deptQx}</if>
-        <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
-        <if test="bureauDeptName != null  and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
-        <if test="lawEnforcementId != null  and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>
-        <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
-        <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-        <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
-        <if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
-        <if test="lawEnforcer != null  and lawEnforcer != ''"> and (law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%'))</if>
-        <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
-        <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
-        <if test="lawEnforcerIdTwo != null  and lawEnforcerIdTwo != ''"> and law_enforcer_id_two = #{lawEnforcerIdTwo}</if>
-        <if test="lawEnforcerTelTwo != null  and lawEnforcerTelTwo != ''"> and law_enforcer_tel_two = #{lawEnforcerTelTwo}</if>
-        <if test="subsidiaryer != null  and subsidiaryer != ''"> and subsidiaryer = #{subsidiaryer}</if>
-        <if test="subsidiaryerId != null  and subsidiaryerId != ''"> and subsidiaryer_id = #{subsidiaryerId}</if>
-        <if test="subsidiaryerTel != null  and subsidiaryerTel != ''"> and subsidiaryer_tel = #{subsidiaryerTel}</if>
-        <if test="lawEnforcementItem != null  and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
-        <if test="lawEnforcementItemText != null  and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%',  #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
-        <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if>
-        <if test="lawEnforcementBasisText != null  and lawEnforcementBasisText != ''"> and law_enforcement_basis_text = #{lawEnforcementBasisText}</if>
-        <if test="reslut != null "> and reslut = #{reslut}</if>
-        <if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
-        <if test="userId != null "> and user_id = #{userId}</if>
-        <if test="deptId != null "> and dept_id = #{deptId}</if>
-        <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-        <if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
-        <if test="status != null "> and status = #{status}</if>
-        <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
-        <if test="uniteCheck == '0'.toString()"> and unite_check is not null</if>
-        <if test="uniteCheck == '1'.toString()"> and unite_check is null</if>
-        <if test="enforce == '0'.toString()"> and check_css is not null</if>
-        <if test="enforce == '1'.toString()"> and check_css is null</if>
-        <if test="checkCategory != null  and checkCategory != ''"> and check_category = #{checkCategory}</if>
-        <if test="checkCss != null  and checkCss != ''"> and check_css = #{checkCss}</if>
-        <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-            and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
-        </if>
-        <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-            and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
-        </if>
+        <include refid="selectEnforcementRegistrationVo"/>
+        <where>
+            and bureau_dept_name is not null
+            and law_enforcement_id is not null
+            and enterprise_name is not null
+            and enterprise_number is not null
+            and law_enforcer is not null
+            and law_enforcer_two is not null
+            and is_complaint is not null
+            and check_category is not null
+            and bureau_dept_id is not null
+            <if test="deptQx != null  and deptQx != ''">and bureau_dept_id =#{deptQx}</if>
+            <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
+            <if test="bureauDeptName != null  and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
+            <if test="lawEnforcementId != null  and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
+            <if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
+            <if test="lawEnforcer != null  and lawEnforcer != ''"> and (law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%'))</if>
+            <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
+            <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
+            <if test="lawEnforcerIdTwo != null  and lawEnforcerIdTwo != ''"> and law_enforcer_id_two = #{lawEnforcerIdTwo}</if>
+            <if test="lawEnforcerTelTwo != null  and lawEnforcerTelTwo != ''"> and law_enforcer_tel_two = #{lawEnforcerTelTwo}</if>
+            <if test="subsidiaryer != null  and subsidiaryer != ''"> and subsidiaryer = #{subsidiaryer}</if>
+            <if test="subsidiaryerId != null  and subsidiaryerId != ''"> and subsidiaryer_id = #{subsidiaryerId}</if>
+            <if test="subsidiaryerTel != null  and subsidiaryerTel != ''"> and subsidiaryer_tel = #{subsidiaryerTel}</if>
+            <if test="lawEnforcementItem != null  and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
+            <if test="lawEnforcementItemText != null  and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%',  #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
+            <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if>
+            <if test="lawEnforcementBasisText != null  and lawEnforcementBasisText != ''"> and law_enforcement_basis_text = #{lawEnforcementBasisText}</if>
+            <if test="reslut != null "> and reslut = #{reslut}</if>
+            <if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+            <if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
+            <if test="uniteCheck == '0'.toString()"> and unite_check is not null</if>
+            <if test="uniteCheck == '1'.toString()"> and unite_check is null</if>
+            <if test="enforce == '0'.toString()"> and check_css is not null</if>
+            <if test="enforce == '1'.toString()"> and check_css is null</if>
+            <if test="checkCategory != null  and checkCategory != ''"> and check_category = #{checkCategory}</if>
+            <if test="checkCss != null  and checkCss != ''"> and check_css = #{checkCss}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
+            </if>
+            <choose>
+                <when test="params.dataScope != null and params.dataScope != ''">
+                    and  dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} or find_in_set( #{deptId} , ancestors ) <![CDATA[ <> ]]> 0 )
+                </when>
+                <!--默认开启权限搜索 -->
+                <otherwise>
+                    ${params.dataScope}
+                </otherwise>
+            </choose>
         </where>
-        order by create_time desc
+            order by create_time desc
     </select>
 
     <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@@ -517,7 +526,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-<!--
+    <!--
     <select id="countMentByTime" resultMap="EnforceRegCountResult"
             resultType="com.zdxt.code.domain.EnforceRegCount">
         SELECT law_enforcement, law_enforcement_id,enterprise_number, COUNT(law_enforcement_id) AS num