mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0605需求

master
OathK1per 2023-06-13 14:31:29 +08:00
parent 46ec4e5c43
commit 50edd26861
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -118,7 +118,7 @@ public class ProjectService {
queryHelper.addCondition("p.stage=?", Integer.parseInt(searchInfo.get("stage"))); queryHelper.addCondition("p.stage=?", Integer.parseInt(searchInfo.get("stage")));
} }
if (StrUtil.isNotEmpty(searchInfo.get("saleStage")) && !"-1".equals(searchInfo.get("saleStage"))) { 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"))) { if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) {
queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond"))); queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond")));

2
src/main/resources/templates/admin/project_list.ftl
View File

@ -1061,7 +1061,7 @@
</#if> </#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" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/edit?id=${list.id}'"><span onclick="location.href='${base}/project/edit?id=${list.id}'"><span