价格管理不查询已经停用的场站

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java

@@ -197,7 +197,7 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
     @Override
     public List<KObject> getStationCameraById(UUID id1) {
         return template.execute(session -> {
-            Query<KObject> query = session.createQuery(" from com.xyst.dinas.camera.datamodel.CameraInfo where station.id=:id and del=:del", KObject.class);
+            Query<KObject> query = session.createQuery(" from com.xyst.dinas.camera.datamodel.CameraInfo where regionalStation.id=:id and del=:del", KObject.class);
             query.setParameter("id", id1);
             query.setParameter("del", false);
             return query.getResultList();

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

@@ -105,7 +105,9 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
         KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
+        detachedCriteria.createAlias("station","station");
         detachedCriteria.add(Restrictions.eq("applyStatus", BizProcessState.DONE_WITH_AGREE.getValue()));
+        detachedCriteria.add(Restrictions.eq("station.stationStatus", 1));
         detachedCriteria.add(Restrictions.eq("adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.PROCESSING.getValue()));
         detachedCriteria.addOrder(Order.desc("adjustmentDate"));
         return detachedCriteria;