Merge remote-tracking branch 'origin/fourthStage' into fourthStage
This commit is contained in:
+4
-1
@@ -1,5 +1,6 @@
|
|||||||
package com.jero.modules.activiti.service;
|
package com.jero.modules.activiti.service;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollStreamUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
@@ -54,7 +55,9 @@ public class ProcessNodeLinkService extends ServiceImpl<ProcessNodeLinkMapper, P
|
|||||||
LambdaQueryWrapper<ProcessNodeLink> wrapper1 = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProcessNodeLink> wrapper1 = new LambdaQueryWrapper<>();
|
||||||
wrapper1.eq(ProcessNodeLink::getProcessNodeId,processNodeId);
|
wrapper1.eq(ProcessNodeLink::getProcessNodeId,processNodeId);
|
||||||
wrapper1.eq(ProcessNodeLink::getProcessInstanceId,processInstanceId);
|
wrapper1.eq(ProcessNodeLink::getProcessInstanceId,processInstanceId);
|
||||||
this.remove(wrapper1);
|
List<ProcessNodeLink> nodeLinkList = this.list(wrapper1);
|
||||||
|
List<String> nodeLinkIdList = CollStreamUtil.toList(nodeLinkList, ProcessNodeLink::getId);
|
||||||
|
this.removeByIds(nodeLinkIdList);
|
||||||
for (String userId : userIdList) {
|
for (String userId : userIdList) {
|
||||||
ProcessNodeLink processNodeLink = new ProcessNodeLink();
|
ProcessNodeLink processNodeLink = new ProcessNodeLink();
|
||||||
processNodeLink.setProcessDefinitionId(processDefinitionId);
|
processNodeLink.setProcessDefinitionId(processDefinitionId);
|
||||||
|
|||||||
Reference in New Issue
Block a user