From 41738f643802cd5b2b84a0d050c719982470a70c Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Tue, 6 Sep 2022 09:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=9A=E5=A2=9E=E5=8A=A0Sw?=
 =?UTF-8?q?Consts.SysParam.RUN=5FPROJECTS=EF=BC=8C=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AA=E8=AF=BB=E5=8F=96=E6=8C=87=E5=AE=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E8=A1=A8=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java  | 2 +-
 .../main/java/cc/smtweb/system/bpm/web/engine/flow/FlowHelper.java    | 4 ++--
 .../main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java  | 3 ++-
 .../src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java   | 3 +--
 .../core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

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<MenuVO> 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<?", FlowConst.ActivityStatu.STOP.value, billId, FlowConst.ActivityStatu.SUBMIT.value);
+                " set tsk_statu=? where tsk_pri_id=? and tsk_id<>? and tsk_statu<?", FlowConst.ActivityStatu.STOP.value, billId,tskId, FlowConst.ActivityStatu.SUBMIT.value);
     }
 
     /**
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java
index 793dc3a..cf6b17d 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java
@@ -799,8 +799,9 @@ public class FlowInstance {
 
             buildRejectTask(toTask, listInsertTask, listInsertCand, listTaskRel, listTaskComment);
         }
+        actInst.setStatu(FlowConst.ActivityStatu.REJECT.value);
         //先停止其他待办或办理中的任务
-        FlowHelper.stopTask(procInst.getId());
+        FlowHelper.stopTask(procInst.getId(), actInst.getId());
         //保存入库
         if (!listInsertTask.isEmpty()) {
             getTaskDao().batchInsertEntity(listInsertTask);
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java
index 00a878d..09df504 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java
@@ -1,6 +1,5 @@
 package cc.smtweb.framework.core.cache;
 
-import cc.smtweb.framework.core.CoreAutoConfiguration;
 import cc.smtweb.framework.core.annotation.SwCache;
 import cc.smtweb.framework.core.cache.redis.RedisBroadcastEvent;
 import cc.smtweb.framework.core.cache.redis.RedisManager;
@@ -110,7 +109,7 @@ public abstract class AbstractCache<T extends Serializable> 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;