diff --git a/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java index 40dab605..765faf12 100644 --- a/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java @@ -1,5 +1,6 @@ package com.cloud.kicc.workflow.api.extension.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,6 +37,7 @@ public class WorkflowButton implements Serializable { private String isHide; /** 下一节点审核人 */ + @TableField("`next`") private String next; /** 排序 */ diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java index 69064e92..095d2d7f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java @@ -17,7 +17,7 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(new ModelHandlerInterceptor()).addPathPatterns("/app/rest/models/**"); + registry.addInterceptor(new ModelHandlerInterceptor()).addPathPatterns("/app/rest/models/**", "/workflow/model/**"); } } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/UiTenantProvider.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/UiTenantProvider.java index bfaae23a..b5b0275c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/UiTenantProvider.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/UiTenantProvider.java @@ -1,7 +1,6 @@ package com.cloud.kicc.workflow.override; -import org.flowable.idm.api.User; -import org.flowable.ui.common.security.SecurityUtils; +import com.cloud.kicc.common.data.entity.KiccUser; import org.flowable.ui.common.tenant.TenantProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,12 +23,12 @@ public class UiTenantProvider implements TenantProvider { @Override public String getTenantId() { - User flowableUser = SecurityUtils.getCurrentUserObject(); - if(flowableUser != null) { + KiccUser kiccUser = com.cloud.kicc.common.security.util.SecurityUtils.getUser(); + if(kiccUser != null) { // quotes can help solve whitespace issues, trimming here would not // help solve the problem at source which is in user database - LOGGER.debug("Using user tenantId: '{}'", flowableUser.getTenantId()); - return flowableUser.getTenantId(); + LOGGER.debug("Using user tenantId: '{}'", kiccUser.getTenantId()); + return kiccUser.getTenantId(); } LOGGER.debug("No tenantId"); diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java index e74842b6..32e4f505 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java @@ -85,7 +85,7 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService { // 设置查询条件 String processDefKey = MapUtil.getStr(params, "processDefKey"), - title = MapUtil.getStr(params, " title"); + title = MapUtil.getStr(params, "title"); Date beginTime = MapUtil.getDate(params, "beginTime"), endTime = MapUtil.getDate(params, "endTime");