流程

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowDefinitionServiceImpl.java

@@ -13,6 +13,7 @@ import com.fjhx.flow.entity.flow.po.FlowDefinitionNode;
 import com.fjhx.flow.entity.flow.po.FlowInfo;
 import com.fjhx.flow.entity.flow.vo.FlowDefinitionPageVo;
 import com.fjhx.flow.entity.flow.vo.FlowDefinitionVo;
+import com.fjhx.flow.enums.HandleTypeEnum;
 import com.fjhx.flow.enums.NodeTypeEnum;
 import com.fjhx.flow.mapper.flow.FlowDefinitionMapper;
 import com.fjhx.flow.service.flow.FlowDefinitionNodeService;
@@ -94,6 +95,7 @@ public class FlowDefinitionServiceImpl extends ServiceImpl<FlowDefinitionMapper,
         startNode.setFlowDefinitionId(flowDefinition.getId());
         startNode.setNodeName("发起申请");
         startNode.setNodeType(NodeTypeEnum.START.getKey());
+        startNode.setNodeButtonSet(HandleTypeEnum.SKIP_TO_NEXT.getValue());
         startNode.setParentId(0L);
 
         FlowDefinitionNode endNode = new FlowDefinitionNode();

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowExampleServiceImpl.java

@@ -221,11 +221,18 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
 
         String nodeButtonSet = flowDefinitionNode.getNodeButtonSet();
         for (String buttonTypeStr : nodeButtonSet.split(",")) {
-            ApprovalRecordVo.ButtonInfo buttonInfo = new ApprovalRecordVo.ButtonInfo();
-            Integer buttonType = Convert.toInt(buttonTypeStr);
-            buttonInfo.setType(buttonType);
-            buttonInfo.setName(HandleTypeEnum.getEnum(buttonType).getValue());
-            buttonInfoList.add(buttonInfo);
+
+            if (buttonTypeStr == null) {
+                continue;
+            }
+
+            Integer buttonType = Convert.toInt(buttonTypeStr.trim());
+            if (buttonType != null) {
+                ApprovalRecordVo.ButtonInfo buttonInfo = new ApprovalRecordVo.ButtonInfo();
+                buttonInfo.setType(buttonType);
+                buttonInfo.setName(HandleTypeEnum.getEnum(buttonType).getValue());
+                buttonInfoList.add(buttonInfo);
+            }
         }
 
         return buttonInfoList;

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -34,6 +35,9 @@ public class SysPasswordService {
     @Value(value = "${user.password.lockTime}")
     private int lockTime;
 
+    @Autowired
+    private HttpServletRequest request;
+
     /**
      * 登录账户密码错误次数缓存键名
      *
@@ -41,7 +45,8 @@ public class SysPasswordService {
      * @return 缓存键key
      */
     private String getCacheKey(String username) {
-        return CacheConstants.PWD_ERR_CNT_KEY + username;
+        String tenantId = request.getHeader("tenantId");
+        return CacheConstants.PWD_ERR_CNT_KEY + tenantId + ":" + username;
     }
 
     public void validate(SysUser user) {