1.消防系统编辑数据同步sql报错

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

@@ -753,6 +753,7 @@
     <select id="getFireFightingSystemDetail"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem">
         SELECT
+
         fs.id,
         f.`name` AS stationname,
         f.`code` AS stationcode,
@@ -760,7 +761,7 @@
         fs.`name` AS aliasname,
         fs.`code`,
         fg.group_name AS systemtype,
-        IFNULL(fs.install_date,'') AS installdate,
+        fs.install_date AS installdate,
         IFNULL(p.`name`,'') AS chargeperson,
         IFNULL(fs.charge_person_phone,'') AS chargepersonphone,
         IFNULL(mi.`name`,'') AS constructionunit,
@@ -780,8 +781,8 @@
         LEFT JOIN rpm_person p ON p.id = fs.charge_person,
         f_station_info f
         <where>
-            <if test="id != null and id !=''">
-                fs.id = #{id}
+            <if test="fireFightingSystemVo != null and fireFightingSystemVo.id != null and fireFightingSystemVo.id !=''">
+                fs.id = #{fireFightingSystemVo.id}
             </if>
         </where>
     </select>