diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
index 35ea37ca..83cf0b9e 100644
--- a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
+++ b/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
@@ -55,8 +55,8 @@ public class PqDevParam {
     private String manufacturer;
 
     @ApiModelProperty(value = "出厂日期", required = true)
-    @NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
-    @DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
+    //@NotBlank(message = DevValidMessage.CREATEDATETIME_NOT_NULL)
+    //@DateTimeStrValid(format = "yyyy-MM-dd", message = DevValidMessage.CREATEDATETIME_FORMAT_ERROR)
     private String createDate;
 
     @ApiModelProperty(value = "设备序列号", required = true)
@@ -190,7 +190,7 @@ public class PqDevParam {
         private String manufacturer;
 
         @ApiModelProperty("检测计划ID")
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR)
+        //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.PLAN_ID_FORMAT_ERROR)
         private String planId;
 
         @ApiModelProperty("检测状态列表")
diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
index b8b62f5f..05afe7f0 100644
--- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
+++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
@@ -249,8 +249,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
 
     @Override
     public List<PqDev> listByPlanId(PqDevParam.QueryParam param) {
+        if(StrUtil.isBlank(param.getPlanId())){
+            return Collections.emptyList();
+        }
         List<PqDev> pqDevList = this.lambdaQuery()
-                .eq(StrUtil.isNotBlank(param.getPlanId()), PqDev::getPlanId, param.getPlanId())
+                .eq(PqDev::getPlanId, param.getPlanId())
                 .like(StrUtil.isNotBlank(param.getName()), PqDev::getName, param.getName())
                 .in(ObjectUtil.isNotEmpty(param.getCheckStateList()), PqDev::getCheckState, param.getCheckStateList())
                 .eq(ObjectUtil.isNotNull(param.getCheckResult()), PqDev::getCheckResult, param.getCheckResult())