From 50edd26861df0edfb06ba2e47bcbaae164443ba2 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 13 Jun 2023 14:31:29 +0800
Subject: [PATCH] =?UTF-8?q?0605=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/service/ProjectService.java | 2 +-
 src/main/resources/templates/admin/project_list.ftl      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 9b95ecb..6ff8c7e 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -118,7 +118,7 @@ public class ProjectService {
                 queryHelper.addCondition("p.stage=?", Integer.parseInt(searchInfo.get("stage")));
             }
             if (StrUtil.isNotEmpty(searchInfo.get("saleStage")) && !"-1".equals(searchInfo.get("saleStage"))) {
-                queryHelper.addCondition("p.saleStage=?", Integer.parseInt(searchInfo.get("saleStage")));
+                queryHelper.addCondition("p.sale_stage=?", Integer.parseInt(searchInfo.get("saleStage")));
             }
             if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) {
                 queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond")));
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 63240c4..98562f6 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -1061,7 +1061,7 @@
                                             </#if>
 
                                             <#--  项目等于预算状态、预算审核为草稿和不通过状态-->
-                                            <#if list.creatorId==adminId && list.status=5 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
+                                            <#if list.creatorId==adminId && list.status=5 && (list.approveStatusEstimate<=0 || list.approveStatusEstimate==3)>
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
                                                         onclick="location.href='${base}/project/edit?id=${list.id}'"><span