diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java
index f7ec3db..4b4b306 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java
@@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 import lombok.Data;
 
 /**
- *
+ * 
  * @TableName disaster_info_vo
  */
 @TableName(value ="disaster_info_vo")
@@ -35,12 +33,12 @@ public class DisasterInfoVo implements Serializable {
     /**
      * 灾害发生时间
      */
-    private LocalDate disasterTime;
+    private Date disasterTime;
 
     /**
      * 灾害发起时间
      */
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     /**
      * 灾害区域地理字段
@@ -108,7 +106,7 @@ public class DisasterInfoVo implements Serializable {
     private String sponsorOrganization;
 
     /**
-     *
+     * 
      */
     private String disasterImg;
 
@@ -118,10 +116,15 @@ public class DisasterInfoVo implements Serializable {
     private String dictValue;
 
     /**
-     *
+     * 
      */
     private Long size;
 
+    /**
+     * 
+     */
+    private String news;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-}
+}
\ No newline at end of file
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index 1024577..0d76b6e 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -154,15 +154,42 @@ public class DisasterInfoController {
 	 */
 	@GetMapping("/homeDisasterInfo")
 	public R<IPage<DisasterInfoVo>> gethomeDisasterInfo(Query query, @RequestParam Map<String, String> params) {
-		return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.<DisasterInfoVo>lambdaQuery()
-			.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
-			.ge(StringUtils.isNotBlank(String.valueOf(params.get("startTime"))),DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("startTime"))))
-			.le(StringUtils.isNotBlank(String.valueOf(params.get("endTime"))),DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("endTime"))))
-			.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
-			.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea")))
-			.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))
-			.orderByDesc(DisasterInfoVo::getDisasterTime)
-		));
+		if(StringUtils.isNotBlank(String.valueOf(params.get("startTime"))) && !"null".equals(String.valueOf(params.get("startTime")))){
+			return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.<DisasterInfoVo>lambdaQuery()
+				.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
+				.ge(DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("startTime"))))
+				.le(DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("endTime"))))
+				.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
+				.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea")))
+				.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))
+				.eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal")))
+				.eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal")))
+				.eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
+				.inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
+					" where t.response_organization = " + params.get("leftVal"))
+				.orderByDesc("Visits".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getVisitCount)
+				.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getDownloadCount)
+				.orderByDesc("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime)
+				.orderByDesc(DisasterInfoVo::getDisasterTime)
+			));
+		}else{
+			return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.<DisasterInfoVo>lambdaQuery()
+				.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
+				.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
+				.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea")))
+				.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))
+				.eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal")))
+				.eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal")))
+				.eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
+				.inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
+					" where t.response_organization = " + params.get("leftVal"))
+				.orderByDesc("Visits".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getVisitCount)
+				.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getDownloadCount)
+				.orderByDesc("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime)
+				.orderByDesc(DisasterInfoVo::getDisasterTime)
+			));
+		}
+
 	}
 
 	/**
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoVoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoVoMapper.java
index f10a04d..a5ba33f 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoVoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoVoMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
 * @author wangns
 * @description 针对表【disaster_info_vo】的数据库操作Mapper
-* @createDate 2023-04-10 17:33:26
+* @createDate 2023-04-11 10:44:37
 * @Entity com.kening.vordm.vo.DisasterInfoVo
 */
 public interface DisasterInfoVoMapper extends BaseMapper<DisasterInfoVo> {
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoVoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoVoService.java
index 20ebf9b..2ef17ce 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoVoService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoVoService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * @author wangns
 * @description 针对表【disaster_info_vo】的数据库操作Service
-* @createDate 2023-04-10 17:33:26
+* @createDate 2023-04-11 10:44:37
 */
 public interface DisasterInfoVoService extends IService<DisasterInfoVo> {
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoVoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoVoServiceImpl.java
index 452e93d..7ac1db3 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoVoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoVoServiceImpl.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 /**
 * @author wangns
 * @description 针对表【disaster_info_vo】的数据库操作Service实现
-* @createDate 2023-04-10 17:33:26
+* @createDate 2023-04-11 10:44:37
 */
 @Service
 public class DisasterInfoVoServiceImpl extends ServiceImpl<DisasterInfoVoMapper, DisasterInfoVo>
diff --git a/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml b/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml
index 20eba77..21120ea 100644
--- a/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml
@@ -26,6 +26,7 @@
             <result property="disasterImg" column="disaster_img" jdbcType="VARCHAR"/>
             <result property="dictValue" column="dict_value" jdbcType="VARCHAR"/>
             <result property="size" column="size" jdbcType="DECIMAL"/>
+            <result property="news" column="news" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -35,6 +36,7 @@
         visit_count,download_count,spider_type,
         tempend_time,temp_start_time,create_time,
         vordm_id,respond_time,sponsor_organization,
-        disaster_img,dict_value,size
+        disaster_img,dict_value,size,
+        news
     </sql>
 </mapper>