出差校验重叠

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/common/FinanceCommonUtils.java

@@ -76,14 +76,14 @@ public class FinanceCommonUtils {
     public static QFilter buildSearchFilter(String entityName, Long billId, Long userId, Date startDate, Date endDate){
         String prefix = "";
 
+        QFilter qFilter = new QFilter("applier", QCP.equals, userId);
+        qFilter.and(new QFilter("id", QCP.not_equals, billId));
         if("er_tripreqbill".equals(entityName)){
+            qFilter.and(new QFilter("billstatus", QCP.not_equals2, "H"));
+
             prefix = "tripentry.";
         }
 
-        QFilter qFilter = new QFilter("billstatus", QCP.equals, "A");
-        qFilter.and(new QFilter("id", QCP.not_equals, billId));
-        qFilter.and(new QFilter("applier", QCP.equals, userId));
-
         QFilter startFilter = new QFilter(prefix + "startDate", QCP.less_equals, startDate);
         startFilter.and(new QFilter(prefix + "endDate", QCP.large_equals, startDate));