Skip to content

Commit a059611

Browse files
YunaiVYunaiV
committed
【功能新增】工作流：完善仿钉钉、飞书模式
1 parent d97f76c commit a059611

30 files changed

+48
-39
lines changed

‎yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import cn.iocoder.yudao.module.ai.dal.mysql.knowledge.AiKnowledgeDocumentMapper;
1515
import cn.iocoder.yudao.module.ai.dal.mysql.knowledge.AiKnowledgeSegmentMapper;
1616
import cn.iocoder.yudao.module.ai.enums.knowledge.AiKnowledgeDocumentStatusEnum;
17-
import jakarta.annotation.Resource;
1817
import lombok.extern.slf4j.Slf4j;
1918
import org.springframework.ai.document.Document;
2019
import org.springframework.ai.reader.tika.TikaDocumentReader;
@@ -25,6 +24,7 @@
2524
import org.springframework.stereotype.Service;
2625
import org.springframework.transaction.annotation.Transactional;
2726

27+
import javax.annotation.Resource;
2828
import java.util.List;
2929

3030
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;

‎yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeSegmentServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import cn.iocoder.yudao.module.ai.dal.mysql.knowledge.AiKnowledgeSegmentMapper;
1616
import cn.iocoder.yudao.module.ai.service.model.AiApiKeyService;
1717
import cn.iocoder.yudao.module.ai.service.model.AiChatModelService;
18-
import jakarta.annotation.Resource;
1918
import lombok.extern.slf4j.Slf4j;
2019
import org.springframework.ai.document.Document;
2120
import org.springframework.ai.vectorstore.SearchRequest;
2221
import org.springframework.ai.vectorstore.VectorStore;
2322
import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
2423
import org.springframework.stereotype.Service;
2524

25+
import javax.annotation.Resource;
2626
import java.util.List;
2727
import java.util.Objects;
2828

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import io.swagger.v3.oas.annotations.Operation;
2020
import io.swagger.v3.oas.annotations.Parameter;
2121
import io.swagger.v3.oas.annotations.tags.Tag;
22-
import jakarta.annotation.Resource;
23-
import jakarta.validation.Valid;
2422
import org.flowable.engine.repository.Deployment;
2523
import org.flowable.engine.repository.Model;
2624
import org.flowable.engine.repository.ProcessDefinition;
2725
import org.springframework.security.access.prepost.PreAuthorize;
2826
import org.springframework.validation.annotation.Validated;
2927
import org.springframework.web.bind.annotation.*;
3028

29+
import javax.annotation.Resource;
30+
import javax.validation.Valid;
3131
import java.util.HashSet;
3232
import java.util.List;
3333
import java.util.Map;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeUpdateBpmnReqVO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotEmpty;
54
import lombok.Data;
65

6+
import javax.validation.constraints.NotEmpty;
7+
78
@Schema(description = "管理后台 - 流程模型的更新 BPMN XML Request VO")
89
@Data
910
public class BpmModeUpdateBpmnReqVO {

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum;
55
import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum;
66
import io.swagger.v3.oas.annotations.media.Schema;
7-
import jakarta.validation.constraints.NotEmpty;
8-
import jakarta.validation.constraints.NotNull;
97
import lombok.Data;
108
import org.hibernate.validator.constraints.URL;
119

10+
import javax.validation.constraints.NotEmpty;
11+
import javax.validation.constraints.NotNull;
1212
import java.util.List;
1313

1414
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotEmpty;
54
import lombok.Data;
65

6+
import javax.validation.constraints.NotEmpty;
7+
78
@Schema(description = "管理后台 - 流程模型的保存 Request VO")
89
@Data
910
public class BpmModelSaveReqVO extends BpmModelMetaInfoVO {

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import com.fasterxml.jackson.annotation.JsonIgnore;
77
import com.fasterxml.jackson.annotation.JsonInclude;
88
import io.swagger.v3.oas.annotations.media.Schema;
9-
import jakarta.validation.Valid;
10-
import jakarta.validation.constraints.NotEmpty;
11-
import jakarta.validation.constraints.NotNull;
129
import lombok.Data;
1310

11+
import javax.validation.Valid;
12+
import javax.validation.constraints.NotEmpty;
13+
import javax.validation.constraints.NotNull;
1414
import java.util.List;
1515
import java.util.Map;
1616

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelUpdateReqVO.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.Valid;
5-
import jakarta.validation.constraints.NotEmpty;
6-
import jakarta.validation.constraints.NotNull;
74
import lombok.Data;
85

6+
import javax.validation.Valid;
7+
import javax.validation.constraints.NotEmpty;
8+
import javax.validation.constraints.NotNull;
9+
910
// TODO @jason：需要考虑，如果某个节点的配置不正确，需要有提示；具体怎么实现，可以讨论下；
1011
@Schema(description = "管理后台 - 仿钉钉流程设计模型的新增/修改 Request VO")
1112
@Data

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import io.swagger.v3.oas.annotations.Operation;
1919
import io.swagger.v3.oas.annotations.Parameter;
2020
import io.swagger.v3.oas.annotations.tags.Tag;
21-
import jakarta.annotation.Resource;
22-
import jakarta.validation.Valid;
2321
import org.flowable.bpmn.model.BpmnModel;
2422
import org.flowable.bpmn.model.UserTask;
2523
import org.flowable.engine.history.HistoricProcessInstance;
@@ -30,6 +28,8 @@
3028
import org.springframework.validation.annotation.Validated;
3129
import org.springframework.web.bind.annotation.*;
3230

31+
import javax.annotation.Resource;
32+
import javax.validation.Valid;
3333
import java.util.Collections;
3434
import java.util.List;
3535
import java.util.Map;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import cn.hutool.core.util.StrUtil;
44
import com.fasterxml.jackson.annotation.JsonIgnore;
55
import io.swagger.v3.oas.annotations.media.Schema;
6-
import jakarta.validation.constraints.AssertTrue;
76
import lombok.Data;
87

8+
import javax.validation.constraints.AssertTrue;
9+
910
// TODO @jason：这个可以简化下，使用 @RequestParam。嘿嘿，主要 VO 项不要太多
1011
@Schema(description = "管理后台 - 审批详情 Request VO")
1112
@Data

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmFormFieldsPermissionReqVO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import cn.hutool.core.util.StrUtil;
44
import com.fasterxml.jackson.annotation.JsonIgnore;
55
import io.swagger.v3.oas.annotations.media.Schema;
6-
import jakarta.validation.constraints.AssertTrue;
76
import lombok.Data;
87

8+
import javax.validation.constraints.AssertTrue;
9+
910
@Schema(description = "管理后台 - 表单字段权限 Request VO")
1011
@Data
1112
public class BpmFormFieldsPermissionReqVO {

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateAssignEmptyStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
99
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
1010
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
11-
import jakarta.annotation.Resource;
1211
import org.flowable.engine.delegate.DelegateExecution;
1312
import org.springframework.context.annotation.Lazy;
1413
import org.springframework.stereotype.Component;
1514

15+
import javax.annotation.Resource;
1616
import java.util.HashSet;
1717
import java.util.Objects;
1818
import java.util.Set;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
77
import cn.iocoder.yudao.module.system.api.permission.RoleApi;
88
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
9-
import jakarta.annotation.Resource;
109
import org.springframework.stereotype.Component;
1110

11+
import javax.annotation.Resource;
1212
import java.util.Set;
1313

1414
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserDeptLeaderMultiStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
1010
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
1111
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
12-
import jakarta.annotation.Resource;
1312
import org.flowable.engine.delegate.DelegateExecution;
1413
import org.flowable.engine.runtime.ProcessInstance;
1514
import org.springframework.context.annotation.Lazy;
1615
import org.springframework.stereotype.Component;
1716

17+
import javax.annotation.Resource;
1818
import java.util.HashSet;
1919
import java.util.Set;
2020

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserDeptLeaderStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
1010
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
1111
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
12-
import jakarta.annotation.Resource;
1312
import org.flowable.engine.delegate.DelegateExecution;
1413
import org.flowable.engine.runtime.ProcessInstance;
1514
import org.springframework.context.annotation.Lazy;
1615
import org.springframework.stereotype.Component;
1716

17+
import javax.annotation.Resource;
1818
import java.util.HashSet;
1919
import java.util.Set;
2020

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
88
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
99
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
10-
import jakarta.annotation.Resource;
1110
import org.flowable.bpmn.model.BpmnModel;
1211
import org.flowable.bpmn.model.UserTask;
1312
import org.flowable.engine.delegate.DelegateExecution;
1413
import org.flowable.engine.runtime.ProcessInstance;
1514
import org.springframework.context.annotation.Lazy;
1615
import org.springframework.stereotype.Component;
1716

17+
import javax.annotation.Resource;
1818
import java.util.*;
1919

2020
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
55
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
66
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
7-
import jakarta.annotation.Resource;
87
import org.flowable.engine.delegate.DelegateExecution;
98
import org.flowable.engine.runtime.ProcessInstance;
109
import org.springframework.context.annotation.Lazy;
1110
import org.springframework.stereotype.Component;
1211

12+
import javax.annotation.Resource;
1313
import java.util.Set;
1414

1515
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmCopyTaskDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import cn.hutool.core.collection.CollUtil;
44
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
55
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceCopyService;
6-
import jakarta.annotation.Resource;
76
import org.flowable.bpmn.model.FlowElement;
87
import org.flowable.engine.delegate.DelegateExecution;
98
import org.flowable.engine.delegate.JavaDelegate;
109
import org.springframework.stereotype.Component;
1110

11+
import javax.annotation.Resource;
1212
import java.util.Set;
1313

1414
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.listener.BpmCopyTaskDelegate.BEAN_NAME;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.List;
2323
import java.util.Map;
2424
import java.util.Objects;
25+
import java.util.stream.Collectors;
2526

2627
import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.OperationButtonSetting;
2728
import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.TimeoutHandler;
@@ -234,7 +235,7 @@ public static String buildConditionExpression(BpmSimpleModelNodeVO conditionNode
234235
} else {
235236
return "";
236237
}
237-
}).toList();
238+
}).collect(Collectors.toList());
238239
conditionExpression = String.format("${%s}", CollUtil.join(strConditionGroups, conditionGroups.getAnd() ? " && " : " || "));
239240
}
240241
}

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelSaveReqVO;
66
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
77
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelUpdateReqVO;
8-
import jakarta.validation.Valid;
98
import org.flowable.bpmn.model.BpmnModel;
109
import org.flowable.engine.repository.Model;
1110

11+
import javax.validation.Valid;
12+
1213
/**
1314
* Flowable流程模型接口
1415
*

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
2020
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
2121
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils;
22-
import jakarta.annotation.Resource;
23-
import jakarta.validation.Valid;
2422
import lombok.extern.slf4j.Slf4j;
2523
import org.flowable.bpmn.model.BpmnModel;
2624
import org.flowable.bpmn.model.StartEvent;
@@ -34,6 +32,8 @@
3432
import org.springframework.transaction.annotation.Transactional;
3533
import org.springframework.validation.annotation.Validated;
3634

35+
import javax.annotation.Resource;
36+
import javax.validation.Valid;
3737
import java.util.List;
3838
import java.util.Objects;
3939

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionInfoMapper;
1313
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
1414
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
15-
import jakarta.annotation.Resource;
1615
import lombok.extern.slf4j.Slf4j;
1716
import org.flowable.bpmn.model.BpmnModel;
1817
import org.flowable.common.engine.impl.db.SuspensionState;
@@ -24,6 +23,7 @@
2423
import org.springframework.stereotype.Service;
2524
import org.springframework.validation.annotation.Validated;
2625

26+
import javax.annotation.Resource;
2727
import java.nio.charset.StandardCharsets;
2828
import java.util.*;
2929

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
55
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
66
import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskTimeoutReqDTO;
7-
import jakarta.validation.Valid;
7+
8+
import javax.validation.Valid;
89

910
/**
1011
* BPM 消息 Service 接口

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskTimeoutReqDTO.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cn.iocoder.yudao.module.bpm.service.message.dto;
22

3-
import jakarta.validation.constraints.NotEmpty;
4-
import jakarta.validation.constraints.NotNull;
53
import lombok.Data;
64

5+
import javax.validation.constraints.NotEmpty;
6+
import javax.validation.constraints.NotNull;
7+
78
/**
89
* BPM 发送任务审批超时 Request DTO
910
*/

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package cn.iocoder.yudao.module.bpm.service.task;
22

3-
import jakarta.annotation.Resource;
43
import lombok.extern.slf4j.Slf4j;
54
import org.flowable.engine.HistoryService;
65
import org.flowable.engine.history.HistoricActivityInstance;
76
import org.springframework.stereotype.Service;
87
import org.springframework.validation.annotation.Validated;
98

9+
import javax.annotation.Resource;
1010
import java.util.List;
1111

1212

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import cn.iocoder.yudao.framework.common.pojo.PageResult;
44
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
55
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
6-
import jakarta.validation.Valid;
76
import org.flowable.engine.history.HistoricProcessInstance;
87
import org.flowable.engine.runtime.ProcessInstance;
98

9+
import javax.validation.Valid;
1010
import java.util.List;
1111
import java.util.Map;
1212
import java.util.Set;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java

+1-1
Large diffs are not rendered by default.

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
55
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
66
import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskTimeoutHandlerTypeEnum;
7-
import jakarta.validation.Valid;
87
import org.flowable.bpmn.model.UserTask;
98
import org.flowable.task.api.Task;
109
import org.flowable.task.api.history.HistoricTaskInstance;
1110

11+
import javax.validation.Valid;
1212
import java.util.Collection;
1313
import java.util.List;
1414
import java.util.Map;

‎yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
1414
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
1515
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
16-
import jakarta.annotation.Resource;
1716
import lombok.extern.slf4j.Slf4j;
1817
import org.aspectj.lang.JoinPoint;
1918
import org.aspectj.lang.annotation.Aspect;
2019
import org.aspectj.lang.annotation.Before;
2120
import org.springframework.stereotype.Component;
2221

22+
import javax.annotation.Resource;
2323
import java.util.*;
2424

2525
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;

0 commit comments

Comments
 (0)