Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java

@@ -26,6 +26,9 @@ public interface DfAnimalPlanMapper extends BaseMapper<DfAnimalPlan> {
             "FROM bs_sgc_df_hdjh p " +
             "LEFT JOIN bs_sgc_df_gcda j ON p.dike_code = j.dike_code " +
             "WHERE 1=1 " +
+            "<if test='dto.dikeCode != null and dto.dikeCode != \"\"'> " +
+            "AND p.dike_code = #{dto.dikeCode} " +
+            "</if> " +
             "<if test='dto.dikeName != null and dto.dikeName != \"\"'> " +
             "AND j.dike_name LIKE CONCAT('%',#{dto.dikeName},'%') " +
             "</if> " +