修改现场bug

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -176,12 +176,15 @@
                vid.name            as name,
                vid.url,
                vid.code,
+               vid.address,
+               vid.img,
                vid.video_type as videoType,
                vid.preset_position as presetPosition,
                vid.name
         from wl_video_equipment_specific as ves
                  left join wl_video as vid on ves.video_id = vid.id
         where equipment_specific_id = #{id}
+                 ORDER BY vid.create_date DESC
     </select>
     <select id="getVideoById" resultType="com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO">
         SELECT

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -114,7 +114,7 @@
                 '%Y-%m-%d'
                 ) = curdate()
             </if>
-            <if test="isExecute!=null and isExecute!='' and isExecute = '3'">and a.is_OK != #{isExecute}</if>
+            <if test="isExecute!=null and isExecute!='' and isExecute == '3'">and a.is_OK != #{isExecute}</if>
         </trim>
     </select>
 
@@ -324,7 +324,7 @@
                 '%Y-%m-%d'
                 ) = curdate()
             </if>
-            <if test="isExecute!=null and isExecute!='' and isExecute = 3">and a.is_OK != #{isExecute}</if>
+            <if test="isExecute!=null and isExecute!='' and isExecute == '3'">and a.is_OK != #{isExecute}</if>
         </trim>
         order by ${orderBy}
         <choose>