Fna接口36

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -136,8 +136,12 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         String status = fnaQueryRequest.getStatus();
         // 流程编号
         queryWrapper.like(StringUtils.isNotBlank(fnaNo), "fna_no", fnaNo);
-        // 状态
-        queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
+        // 状态 'DRAFT'-草稿, 'UNCOMPLETED'-未完成, 'COMPLETED'-已完成，默认查询未完成和已完成
+        if (StringUtils.isBlank(customerName)) {
+            queryWrapper.in("status", "DRAFT", "UNCOMPLETED", "COMPLETED");
+        } else {
+            queryWrapper.eq("status", status);
+        }
         // 创建时间开始
         queryWrapper.ge(ObjectUtils.isNotEmpty(startTime), "create_time", startTime);
         // 创建时间结束