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

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -717,7 +717,7 @@
         ) d
         <where>
             <if test="fireEquipmentName!=null">
-                AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
+                AND d.fireEquipmentName LIKE '%#{fireEquipmentName}%'
             </if>
             <if test="startTime != null and startTime != ''">
                 AND d.update_date &gt;= #{startTime}
@@ -762,7 +762,7 @@
         ) d
         <where>
             <if test="fireEquipmentName!=null">
-                AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
+                AND d.fireEquipmentName LIKE concat('%', #{fireEquipmentName}, '%')
             </if>
             <if test="startTime != null and startTime != ''">
                 AND d.create_date &gt;= #{startTime}
@@ -772,6 +772,6 @@
             </if>
         </where>
         ORDER BY d.create_date desc
-        LIMIT ${start},${length}
+        LIMIT #{start},#{length}
     </select>
 </mapper>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -576,8 +576,7 @@
         <where>
             <if test="inputText!=null and inputText != ''">
                 (
-                tmp.code LIKE '%${inputText}%'
-                OR tmp.name LIKE '%${inputText}%'
+                tmp.code LIKE concat('%', #{inputText}, '%')
                 )
             </if>
             <if test="type!=null and type!=''">