ENSO修改

ruoyi-system/src/main/resources/mapper/system/ENSOImpactMapper.xml

@@ -135,7 +135,7 @@
     </select>
     <select id="ensoEventRate" resultMap="ENSO_Event_Rate">
         select id,
-               type,
+            type,
             zone,
             event,
             event_en,
@@ -176,12 +176,11 @@
     <select id="ensoEventAnalysis" resultMap="ENSO_Event_Analysis">
         select id, year, type, zone, value
         from enso_event_analysis
-        where year in
+        where type = #{type}
+        and zone =#{zone}
+        and year in
         <foreach collection="year" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and type = #{type}
-        and zone =#{zone}
-
     </select>
 </mapper>