Commit 0ce5e1bf authored by chenhao's avatar chenhao

将assign的人设置为字符串数组的形式,来满足需求

parent c89e4d85
...@@ -60,7 +60,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService { ...@@ -60,7 +60,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("checkFlag", false); map.put("checkFlag", false);
JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId); JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
if (ObjectUtils.isNotEmpty(teskObject)) { if (ObjectUtils.isNotEmpty(teskObject.getJSONArray("data"))) {
JSONArray taskDetailArray = teskObject.getJSONArray("data"); JSONArray taskDetailArray = teskObject.getJSONArray("data");
for (Object obj : taskDetailArray) { for (Object obj : taskDetailArray) {
JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj)); JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
...@@ -79,7 +79,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService { ...@@ -79,7 +79,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
String assignUser = taskAssignObject.getJSONObject("data").getString("assignee"); String assignUser = taskAssignObject.getJSONObject("data").getString("assignee");
if (StringUtils.isNotBlank(assignUser)) { if (StringUtils.isNotBlank(assignUser)) {
// 如果当前登录人与当前任务的设定人不一定,则直接返回权限校验失败 // 如果当前登录人与当前任务的设定人不一定,则直接返回权限校验失败
if (!currentLoginUserId.equals(assignUser)) { if (!assignUser.contains(currentLoginUserId)) {
return map; return map;
} }
map.put("taskId", detail.getString("id")); map.put("taskId", detail.getString("id"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment