fix 修复 流程数据重复更新 状态被覆盖 无法完成流程问题

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java

@@ -4,10 +4,11 @@ import cn.dev33.satoken.stp.StpInterface;
 import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.UserType;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.service.PermissionService;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,9 +20,6 @@ import java.util.List;
  */
 public class SaPermissionImpl implements StpInterface {
 
-    @Autowired
-    private PermissionService permissionService;
-
     /**
      * 获取菜单权限列表
      */
@@ -29,8 +27,13 @@ public class SaPermissionImpl implements StpInterface {
     public List<String> getPermissionList(Object loginId, String loginType) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) {
-            List<String> list = StringUtils.splitList(loginId.toString(), ":");
-            return new ArrayList<>(permissionService.getMenuPermission(Long.parseLong(list.get(1))));
+            PermissionService permissionService = getPermissionService();
+            if (ObjectUtil.isNotNull(permissionService)) {
+                List<String> list = StringUtils.splitList(loginId.toString(), ":");
+                return new ArrayList<>(permissionService.getMenuPermission(Long.parseLong(list.get(1))));
+            } else {
+                throw new ServiceException("PermissionService 实现类不存在");
+            }
         }
         UserType userType = UserType.getUserType(loginUser.getUserType());
         if (userType == UserType.APP_USER) {
@@ -47,8 +50,13 @@ public class SaPermissionImpl implements StpInterface {
     public List<String> getRoleList(Object loginId, String loginType) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) {
-            List<String> list = StringUtils.splitList(loginId.toString(), ":");
-            return new ArrayList<>(permissionService.getRolePermission(Long.parseLong(list.get(1))));
+            PermissionService permissionService = getPermissionService();
+            if (ObjectUtil.isNotNull(permissionService)) {
+                List<String> list = StringUtils.splitList(loginId.toString(), ":");
+                return new ArrayList<>(permissionService.getRolePermission(Long.parseLong(list.get(1))));
+            } else {
+                throw new ServiceException("PermissionService 实现类不存在");
+            }
         }
         UserType userType = UserType.getUserType(loginUser.getUserType());
         if (userType == UserType.APP_USER) {
@@ -57,4 +65,13 @@ public class SaPermissionImpl implements StpInterface {
         // SYS_USER 默认返回权限
         return new ArrayList<>(loginUser.getRolePermission());
     }
+
+    private PermissionService getPermissionService() {
+        try {
+            return SpringUtils.getBean(PermissionService.class);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java

@@ -58,7 +58,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort());
         lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel());
         lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType());
-        lqw.orderByAsc(SysDictData::getDictSort);
+        lqw.orderByAsc(SysDictData::getDictSort, SysDictData::getDictCode);
         return lqw;
     }
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -15,6 +15,7 @@ import org.dromara.warm.flow.core.entity.Task;
 import org.dromara.warm.flow.core.listener.GlobalListener;
 import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
 import org.dromara.warm.flow.orm.entity.FlowTask;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.common.constant.FlowConstant;
@@ -106,6 +107,7 @@ public class WorkflowGlobalListener implements GlobalListener {
         Task task = listenerVariable.getTask();
         Map<String, Object> params = new HashMap<>();
         FlowParams flowParams = listenerVariable.getFlowParams();
+        Map<String, Object> variable = new HashMap<>();
         if (ObjectUtil.isNotNull(flowParams)) {
             // 历史任务扩展(通常为附件)
             params.put("hisTaskExt", flowParams.getHisTaskExt());
@@ -113,8 +115,8 @@ public class WorkflowGlobalListener implements GlobalListener {
             params.put("handler", flowParams.getHandler());
             // 办理意见
             params.put("message", flowParams.getMessage());
+            variable = flowParams.getVariable();
         }
-        Map<String, Object> variable = flowParams.getVariable();
         //申请人提交事件
         Boolean submit = MapUtil.getBool(variable, FlowConstant.SUBMIT);
         if (submit != null && submit) {
@@ -150,13 +152,15 @@ public class WorkflowGlobalListener implements GlobalListener {
                         flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
                     }
                 }
+                FlowInstance ins = new FlowInstance();
                 Map<String, Object> variableMap = instance.getVariableMap();
                 variableMap.remove(FlowConstant.FLOW_COPY_LIST);
                 variableMap.remove(FlowConstant.MESSAGE_TYPE);
                 variableMap.remove(FlowConstant.MESSAGE_NOTICE);
                 variableMap.remove(FlowConstant.SUBMIT);
-                instance.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
-                insService.updateById(instance);
+                ins.setId(instance.getId());
+                ins.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
+                insService.updateById(ins);
             }
         }
     }

script/sql/oracle/oracle_ry_vue_5.X.sql

@@ -623,6 +623,10 @@ insert into sys_role_menu values ('3', '107');
 insert into sys_role_menu values ('3', '108');
 insert into sys_role_menu values ('3', '118');
 insert into sys_role_menu values ('3', '123');
+insert into sys_role_menu values ('3', '130');
+insert into sys_role_menu values ('3', '131');
+insert into sys_role_menu values ('3', '132');
+insert into sys_role_menu values ('3', '133');
 insert into sys_role_menu values ('3', '500');
 insert into sys_role_menu values ('3', '501');
 insert into sys_role_menu values ('3', '1001');
@@ -696,8 +700,11 @@ insert into sys_role_menu values ('3', '1620');
 insert into sys_role_menu values ('3', '1621');
 insert into sys_role_menu values ('3', '1622');
 insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11616');
 insert into sys_role_menu values ('3', '11618');
 insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11622');
+insert into sys_role_menu values ('3', '11623');
 insert into sys_role_menu values ('3', '11629');
 insert into sys_role_menu values ('3', '11632');
 insert into sys_role_menu values ('3', '11633');
@@ -707,6 +714,7 @@ insert into sys_role_menu values ('3', '11640');
 insert into sys_role_menu values ('3', '11641');
 insert into sys_role_menu values ('3', '11642');
 insert into sys_role_menu values ('3', '11643');
+insert into sys_role_menu values ('3', '11701');
 insert into sys_role_menu values ('4', '5');
 insert into sys_role_menu values ('4', '1500');
 insert into sys_role_menu values ('4', '1501');

script/sql/postgres/postgres_ry_vue_5.X.sql

@@ -624,6 +624,10 @@ insert into sys_role_menu values ('3', '107');
 insert into sys_role_menu values ('3', '108');
 insert into sys_role_menu values ('3', '118');
 insert into sys_role_menu values ('3', '123');
+insert into sys_role_menu values ('3', '130');
+insert into sys_role_menu values ('3', '131');
+insert into sys_role_menu values ('3', '132');
+insert into sys_role_menu values ('3', '133');
 insert into sys_role_menu values ('3', '500');
 insert into sys_role_menu values ('3', '501');
 insert into sys_role_menu values ('3', '1001');
@@ -697,8 +701,11 @@ insert into sys_role_menu values ('3', '1620');
 insert into sys_role_menu values ('3', '1621');
 insert into sys_role_menu values ('3', '1622');
 insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11616');
 insert into sys_role_menu values ('3', '11618');
 insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11622');
+insert into sys_role_menu values ('3', '11623');
 insert into sys_role_menu values ('3', '11629');
 insert into sys_role_menu values ('3', '11632');
 insert into sys_role_menu values ('3', '11633');
@@ -708,6 +715,7 @@ insert into sys_role_menu values ('3', '11640');
 insert into sys_role_menu values ('3', '11641');
 insert into sys_role_menu values ('3', '11642');
 insert into sys_role_menu values ('3', '11643');
+insert into sys_role_menu values ('3', '11701');
 insert into sys_role_menu values ('4', '5');
 insert into sys_role_menu values ('4', '1500');
 insert into sys_role_menu values ('4', '1501');

script/sql/ry_vue_5.X.sql

@@ -448,6 +448,10 @@ insert into sys_role_menu values ('3', '107');
 insert into sys_role_menu values ('3', '108');
 insert into sys_role_menu values ('3', '118');
 insert into sys_role_menu values ('3', '123');
+insert into sys_role_menu values ('3', '130');
+insert into sys_role_menu values ('3', '131');
+insert into sys_role_menu values ('3', '132');
+insert into sys_role_menu values ('3', '133');
 insert into sys_role_menu values ('3', '500');
 insert into sys_role_menu values ('3', '501');
 insert into sys_role_menu values ('3', '1001');
@@ -521,8 +525,11 @@ insert into sys_role_menu values ('3', '1620');
 insert into sys_role_menu values ('3', '1621');
 insert into sys_role_menu values ('3', '1622');
 insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11616');
 insert into sys_role_menu values ('3', '11618');
 insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11622');
+insert into sys_role_menu values ('3', '11623');
 insert into sys_role_menu values ('3', '11629');
 insert into sys_role_menu values ('3', '11632');
 insert into sys_role_menu values ('3', '11633');
@@ -532,6 +539,7 @@ insert into sys_role_menu values ('3', '11640');
 insert into sys_role_menu values ('3', '11641');
 insert into sys_role_menu values ('3', '11642');
 insert into sys_role_menu values ('3', '11643');
+insert into sys_role_menu values ('3', '11701');
 insert into sys_role_menu values ('4', '5');
 insert into sys_role_menu values ('4', '1500');
 insert into sys_role_menu values ('4', '1501');

script/sql/sqlserver/sqlserver_ry_vue_5.X.sql

@@ -2494,6 +2494,14 @@ INSERT sys_role_menu VALUES (3, 118);
 GO
 INSERT sys_role_menu VALUES (3, 123);
 GO
+INSERT sys_role_menu VALUES (3, 130);
+GO
+INSERT sys_role_menu VALUES (3, 131);
+GO
+INSERT sys_role_menu VALUES (3, 132);
+GO
+INSERT sys_role_menu VALUES (3, 133);
+GO
 INSERT sys_role_menu VALUES (3, 500);
 GO
 INSERT sys_role_menu VALUES (3, 501);
@@ -2640,10 +2648,16 @@ INSERT sys_role_menu VALUES (3, 1622);
 GO
 INSERT sys_role_menu VALUES (3, 1623);
 GO
+INSERT sys_role_menu VALUES (3, 11616);
+GO
 INSERT sys_role_menu VALUES (3, 11618);
 GO
 INSERT sys_role_menu VALUES (3, 11619);
 GO
+INSERT sys_role_menu VALUES (3, 11622);
+GO
+INSERT sys_role_menu VALUES (3, 11623);
+GO
 INSERT sys_role_menu VALUES (3, 11629);
 GO
 INSERT sys_role_menu VALUES (3, 11632);
@@ -2662,6 +2676,8 @@ INSERT sys_role_menu VALUES (3, 11642);
 GO
 INSERT sys_role_menu VALUES (3, 11643);
 GO
+INSERT sys_role_menu VALUES (3, 11701);
+GO
 INSERT sys_role_menu VALUES (4, 5);
 GO
 INSERT sys_role_menu VALUES (4, 1500);