diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java index 781fec9..6bcd142 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java @@ -32,7 +32,7 @@ public class PreviewMenuTreeService { public R treeAll(@SwParam("module") String module, UserSession us) { String prj_id = ModelProjectCache.getInstance().getIdByModule(module); - if(!SwConsts.SYS_DEBUG){ + if(!SwConsts.SysParam.SYS_DEBUG){ List menuVOList = buildMenu(prj_id, module, us); if (PubUtil.isNotEmpty(menuVOList)) { return R.success(menuVOList); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowHelper.java index 36f8cba..288160b 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowHelper.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowHelper.java @@ -47,9 +47,9 @@ public class FlowHelper { " where r.trl_dst_task_id=? and t.tsk_handler=?", task_id, user_id); } - public static void stopTask(long billId) { + public static void stopTask(long billId, long tskId) { DbEngine.getInstance().update("update " + EntityHelper.getSchemaTableName(Task.ENTITY_NAME) + - " set tsk_statu=? where tsk_pri_id=? and tsk_statu? and tsk_statu implements ISwCache< * 否则,非lazy,从数据库加载,并更新redis */ protected void init() { - if (!SwConsts.SYS_DEBUG && RedisManager.getInstance().exists(getIdent())) { + if (!SwConsts.SysParam.SYS_DEBUG && RedisManager.getInstance().exists(getIdent())) { log.info("从redis同步缓存!(" + getTitle() + ")"); //从缓存服务器下载到本地 syncCache(); diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java index 4787110..83f5e24 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java @@ -5,13 +5,13 @@ package cc.smtweb.framework.core.common; */ public interface SwConsts { class SysParam { + //开发调试模式 + public static final boolean SYS_DEBUG = true; //系统启动完成 public static boolean SYS_STARTED = false; //运行的项目,多个用半角逗号分隔 public static String RUN_PROJECTS = "bpm"; } - //开发调试模式 - boolean SYS_DEBUG = true; int DEFAULT_ORDER = 1;