Browse Source

chore: work todo task compose

master
wangxiang 2 years ago
parent
commit
924784727f
No known key found for this signature in database
GPG Key ID: 1BA7946AB6B232E4
  1. 2
      kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java
  2. 2
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java
  3. 11
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/UiTenantProvider.java
  4. 2
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java

2
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; package com.cloud.kicc.workflow.api.extension.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -36,6 +37,7 @@ public class WorkflowButton implements Serializable {
private String isHide; private String isHide;
/** 下一节点审核人 */ /** 下一节点审核人 */
@TableField("`next`")
private String next; private String next;
/** 排序 */ /** 排序 */

2
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 @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new ModelHandlerInterceptor()).addPathPatterns("/app/rest/models/**"); registry.addInterceptor(new ModelHandlerInterceptor()).addPathPatterns("/app/rest/models/**", "/workflow/model/**");
} }
} }

11
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; package com.cloud.kicc.workflow.override;
import org.flowable.idm.api.User; import com.cloud.kicc.common.data.entity.KiccUser;
import org.flowable.ui.common.security.SecurityUtils;
import org.flowable.ui.common.tenant.TenantProvider; import org.flowable.ui.common.tenant.TenantProvider;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -24,12 +23,12 @@ public class UiTenantProvider implements TenantProvider {
@Override @Override
public String getTenantId() { public String getTenantId() {
User flowableUser = SecurityUtils.getCurrentUserObject(); KiccUser kiccUser = com.cloud.kicc.common.security.util.SecurityUtils.getUser();
if(flowableUser != null) { if(kiccUser != null) {
// quotes can help solve whitespace issues, trimming here would not // quotes can help solve whitespace issues, trimming here would not
// help solve the problem at source which is in user database // help solve the problem at source which is in user database
LOGGER.debug("Using user tenantId: '{}'", flowableUser.getTenantId()); LOGGER.debug("Using user tenantId: '{}'", kiccUser.getTenantId());
return flowableUser.getTenantId(); return kiccUser.getTenantId();
} }
LOGGER.debug("No tenantId"); LOGGER.debug("No tenantId");

2
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"), String processDefKey = MapUtil.getStr(params, "processDefKey"),
title = MapUtil.getStr(params, " title"); title = MapUtil.getStr(params, "title");
Date beginTime = MapUtil.getDate(params, "beginTime"), Date beginTime = MapUtil.getDate(params, "beginTime"),
endTime = MapUtil.getDate(params, "endTime"); endTime = MapUtil.getDate(params, "endTime");

Loading…
Cancel
Save