筛选条件别名少了一个master

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java

@@ -157,7 +157,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
 
         detachedCriteria.add(Restrictions.eq("master." + BaseConstants.DEL, false))
                 .add(Restrictions.in("master.applyStatus", BizProcessState.DONE_WITH_AGREE.getValue()))
-                .add(Restrictions.eq("adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.PROCESSING.getValue()))
+                .add(Restrictions.eq("master.adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.PROCESSING.getValue()))
                 .createAlias("master", "master")
                 .createAlias("master.station", "station")
                 .createAlias("master.regionalCompany", "regionalCompany")
@@ -257,10 +257,10 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
             Object value = byCriterion.get("value");
             priceAdjustment.setId(UUID.fromString(adjustmentId.toString()));
             Date o1 = (Date) o;
-            if (!o1.before(adjustmentStartDate) && null != adjustmentStartDate) {
+            if ( null != adjustmentStartDate&&!o1.before(adjustmentStartDate) ) {
                 o1 = adjustmentStartDate;
             }
-            if (o1.after(adjustmentEndDate) && null != adjustmentStartDate) {
+            if (null != adjustmentStartDate&&o1.after(adjustmentEndDate) ) {
                 o1 = adjustmentEndDate;
             }
             priceAdjustment.setTime(o1);