From f7419a63fa3a88a64c5d6c9d38ffbfe1e85b3df6 Mon Sep 17 00:00:00 2001 From: lixiaoyuan Date: Mon, 16 Mar 2026 17:29:42 +0800 Subject: [PATCH] =?UTF-8?q?policy=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eis=5Fdel=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=B0=96=E5=B3=B0=E5=B9=B3?= =?UTF-8?q?=E8=B0=B7=E4=BB=B7=E6=A0=BC=E5=92=8C=E7=B1=BB=E5=9E=8B=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E6=98=A0=E5=B0=84=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/database/Dao.cpp | 2 +- src/protocol/HttpEntity.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/database/Dao.cpp b/src/database/Dao.cpp index da0914c..ae202e5 100644 --- a/src/database/Dao.cpp +++ b/src/database/Dao.cpp @@ -469,7 +469,7 @@ Errcode DAO::updateDeviceById(Fields& params) // 策略管理 Errcode DAO::queryPolicyList(PageInfo& pageInfo, vector& result) { - std::string sqlFrom = "FROM " + DMPolicy::TABLENAME; + std::string sqlFrom = "FROM " + DMPolicy::TABLENAME + " WHERE is_del != '1'"; return QueryPagination("*", sqlFrom, pageInfo, result); } diff --git a/src/protocol/HttpEntity.cpp b/src/protocol/HttpEntity.cpp index dc25137..116d8c9 100644 --- a/src/protocol/HttpEntity.cpp +++ b/src/protocol/HttpEntity.cpp @@ -1949,10 +1949,10 @@ Errcode HttpEntity::queryEGridPeriod(const httplib::Request& req, njson& json, s { int etype = item.get("etype"); float price = item.get("price", 2); - if (etype == 1) { priceJ = price; } - else if (etype == 2) { priceF = price; } - else if (etype == 3) { priceP = price; } - else if (etype == 4) { priceG = price; } + if (etype == 1) { priceG = price; } + else if (etype == 2) { priceP = price; } + else if (etype == 3) { priceF = price; } + else if (etype == 4) { priceJ = price; } else if (etype == 9) { priceC = price; } } }