Merge remote-tracking branch 'origin/master'

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -70,11 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
             <if test="searchValue != null and searchValue != ''">
-                and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
+                and ( law_enforcement_item like concat(concat('%',#{searchValue}),'%')
-                or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
-                or law_enforcer like concat(concat('%',#{searchValue}),'%')
-                or law_enforcement_item like concat(concat('%',#{searchValue}),'%')
                 or law_enforcement like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer like concat(concat('%',#{searchValue}),'%')
                 )
             </if>
             <if test="dateType != null and dateType == 1">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@@ -54,8 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkRequire != null  and checkRequire != ''"> and check_require = #{checkRequire}</if>
             <if test="searchValue != null and searchValue != ''">
                 and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
-                or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
                 or check_item like concat(concat('%',#{searchValue}),'%')
+                or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
                 or law_enforcement like concat(concat('%',#{searchValue}),'%')
                 )
             </if>