diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java
index d6b4021..b0d57e3 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaContractBo.java
@@ -83,6 +83,7 @@ public class SysOaContractBo extends BaseEntity {
     /**
      * 签订日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date signTime;
 
     /**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java
index ab93950..941384f 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaContractServiceImpl.java
@@ -133,7 +133,8 @@ public class SysOaContractServiceImpl implements ISysOaContractService {
     private LambdaQueryWrapper<SysOaContract> buildQueryWrapper(SysOaContractBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysOaContract> lqw = Wrappers.lambdaQuery();
-        lqw.eq(SysOaContract::getContractType, '0');
+        lqw.eq(bo.getProjectId() != null, SysOaContract::getProjectId, bo.getProjectId());
+        lqw.eq(StringUtils.isNotBlank(bo.getContractType()), SysOaContract::getContractType, bo.getContractType());
         lqw.eq(StringUtils.isNotBlank(bo.getContractNum()), SysOaContract::getContractNum, bo.getContractNum());
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), SysOaContract::getContractName, bo.getContractName());
         lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,