Browse Source

[feat]

1、增加预警管理根据标签查询
2、增加工作流动态增加处理人逻辑。
3、对接设备权限②
wuyuan
杨威 2 months ago
parent
commit
f29808dfaf
  1. 6
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
  2. 2
      dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml

6
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -41,6 +42,7 @@ import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.enums.MessageTypeEnum;
import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.workflow.common.enums.TaskAssigneeType;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.bo.*;
@ -908,13 +910,15 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
List<RemoteUserVo> totalUser = new ArrayList<>();
if (!first.contains("${handler}")){
if (ObjectUtil.isNotEmpty(first)){
String[] split = first.split("@@");
for (String handleFlag : split) {
if (!handleFlag.equals("${handler}")){
List<RemoteUserVo> remoteUserVos = flwTaskAssigneeService.fetchUsersByStorageId(handleFlag);
totalUser.addAll(remoteUserVos);
}
}
}
//比较差值
List<RemoteUserVo> different = totalUser.stream()

2
dk-modules/workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml

@ -115,6 +115,6 @@
<select id="getPermissionFlag" resultType="java.lang.String">
select fn.permission_flag from flow_node fn where fn.definition_id = #{definitionId} and fn.node_type = #{nodeType} and fn.node_code = #{nodeCode} and fn.del_flag = 0
select fn.permission_flag from flow_node fn where fn.definition_id = #{definitionId} and fn.node_type = #{nodeType} and fn.node_code = #{nodeCode} and fn.del_flag = '0'
</select>
</mapper>

Loading…
Cancel
Save