修改-月计划排序

yd-api/src/main/resources/mapper/meta/MdGoalsCalculateExpressionMapper.xml

@@ -177,9 +177,13 @@
   </update>
   </update>
     <select id="findByMasterId" resultMap="BaseResultMap">
     <select id="findByMasterId" resultMap="BaseResultMap">
       select
       select
-      <include refid="Base_Column_List" />
-      from ag_md_goals_calculate_expression
-      where drop_master_id = #{masterId,jdbcType=BIGINT}
-      and is_active = 1
+          e.*
+      from
+          ag_md_goals_calculate_expression e
+          left join ag_md_drop_options o on o.id = e.action_id
+      where
+              o.drop_master_id = #{masterId,jdbcType=BIGINT}
+        and e.is_active = 1
+      order by o.drop_option_order;
     </select>
     </select>
 </mapper>
 </mapper>
\ No newline at end of file