Merge remote-tracking branch 'origin/dev' into dev

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml

@@ -193,8 +193,8 @@
             AND r.bureau_dept_name LIKE CONCAT('%', #{bo.bureauDeptName}, '%')
         </if>
         <if test="bo.lawEnforcer != null and bo.lawEnforcer != ''">
-            AND (law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
-            ORr. law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
+            AND (r.law_enforcer LIKE CONCAT('%', #{bo.lawEnforcer}, '%')
+            OR r.law_enforcer_two LIKE CONCAT('%', #{bo.lawEnforcer}, '%'))
         </if>
         <if test="bo.enterpriseName != null and bo.enterpriseName != ''">
             AND r.enterprise_name LIKE CONCAT('%', #{bo.enterpriseName}, '%')