diff --git a/src/main/java/cn/palmte/work/config/activiti/ActivitiConfig.java b/src/main/java/cn/palmte/work/config/activiti/ActivitiConfig.java index 513994d..3b3aa8f 100644 --- a/src/main/java/cn/palmte/work/config/activiti/ActivitiConfig.java +++ b/src/main/java/cn/palmte/work/config/activiti/ActivitiConfig.java @@ -1,5 +1,6 @@ package cn.palmte.work.config.activiti; +import org.activiti.engine.ProcessEngineConfiguration; import org.activiti.spring.SpringProcessEngineConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -32,7 +33,7 @@ public class ActivitiConfig { //true: activiti会对数据库中所有表进行更新操作。如果表不存在,则自动创建。(开发时常用) //create_drop: 在activiti启动时创建表,在关闭时删除表(必须手动关闭引擎,才能删除表)。(单元测试常用) //drop-create: 在activiti启动时删除原来的旧表,然后在创建新表(不需要手动关闭引擎)。 - config.setDatabaseSchemaUpdate("true"); + config.setDatabaseSchemaUpdate(ProcessEngineConfiguration.DB_SCHEMA_UPDATE_FALSE); return config; } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index ccd7e2d..70b8f9b 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -211,8 +211,8 @@ <#-- <@shiro.hasPermission name="PROJECT_EDIT">--> - <#-- 概算审核通过 并且预算审批状态为草稿和不通过 --> - <#if list.approveStatusEstimate=2 && (list.approveStatusBudget==-1 || list.approveStatusBudget==0 || list.approveStatusBudget==3) > + <#-- 概算审核通过、预算审批不等于待审核、 结算审批未通过--> + <#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >