Merge branch 'dev'
This commit is contained in:
commit
59a15e2ce9
|
@ -146,6 +146,7 @@ public class DemandDataListener implements TaskListener, ExecutionListener, Acti
|
||||||
logger.error("未查到该部门对应的{} ", roleName);
|
logger.error("未查到该部门对应的{} ", roleName);
|
||||||
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
} else { // 填入大数据审批人
|
} else { // 填入大数据审批人
|
||||||
logger.error("大数据局名称:{}", bigDateDeptName);
|
logger.error("大数据局名称:{}", bigDateDeptName);
|
||||||
|
@ -157,10 +158,12 @@ public class DemandDataListener implements TaskListener, ExecutionListener, Acti
|
||||||
logger.error("大数据审批人id:{}", userDTO.getId());
|
logger.error("大数据审批人id:{}", userDTO.getId());
|
||||||
taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
|
taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
|
||||||
assignee = userDTO.getId().toString();
|
assignee = userDTO.getId().toString();
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
} else {
|
} else {
|
||||||
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
||||||
logger.error("未查到大数据部门对应 {}", roleName);
|
logger.error("未查到大数据部门对应 {}", roleName);
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -142,6 +142,7 @@ public class CommentListener implements TaskListener, ExecutionListener, Activit
|
||||||
delegateTask.setAssignee(defaultAssigneeRoleId);
|
delegateTask.setAssignee(defaultAssigneeRoleId);
|
||||||
logger.error("未查到该部门对应 {}", roleName);
|
logger.error("未查到该部门对应 {}", roleName);
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> kv = delegateTask.getVariables();
|
Map<String, Object> kv = delegateTask.getVariables();
|
||||||
|
|
|
@ -113,6 +113,7 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
|
||||||
logger.error("审批人id:" + userDTO.getId());
|
logger.error("审批人id:" + userDTO.getId());
|
||||||
taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
|
taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
|
||||||
assignee = userDTO.getId().toString();
|
assignee = userDTO.getId().toString();
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
} else {
|
} else {
|
||||||
delegateTask.setAssignee(defaultAssigneeRoleId);
|
delegateTask.setAssignee(defaultAssigneeRoleId);
|
||||||
logger.error("未查到该部门对应 " + roleName);
|
logger.error("未查到该部门对应 " + roleName);
|
||||||
|
|
|
@ -185,6 +185,7 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
|
||||||
logger.error("未查到该部门 {} 对应的 {}", deptId, roleName);
|
logger.error("未查到该部门 {} 对应的 {}", deptId, roleName);
|
||||||
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
if (kv.containsKey("tAbilityApplicationDTOList")) {
|
if (kv.containsKey("tAbilityApplicationDTOList")) {
|
||||||
List<TAbilityApplicationDTO> dtoList = (List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList");
|
List<TAbilityApplicationDTO> dtoList = (List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList");
|
||||||
|
|
|
@ -143,9 +143,11 @@ public class ResourceUndercarriageListener implements TaskListener, ExecutionLis
|
||||||
} else {
|
} else {
|
||||||
logger.error("未查到该部门对应的 " + roleName + " 将使用大数据部门审核人");
|
logger.error("未查到该部门对应的 " + roleName + " 将使用大数据部门审核人");
|
||||||
assignee = defaultUser(delegateTask.getId(), roleDTO);
|
assignee = defaultUser(delegateTask.getId(), roleDTO);
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
assignee = defaultUser(delegateTask.getId(), roleDTO);
|
assignee = defaultUser(delegateTask.getId(), roleDTO);
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.isNotEmpty(assignee)
|
if (StringUtils.isNotEmpty(assignee)
|
||||||
|
|
|
@ -215,6 +215,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
|
||||||
logger.error("未查到该部门对应的 " + roleName);
|
logger.error("未查到该部门对应的 " + roleName);
|
||||||
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
} else if (resourceMountApplyDTO.getDeptId() != null) {
|
} else if (resourceMountApplyDTO.getDeptId() != null) {
|
||||||
SysUserDTO userDTO = sysUserService.getByDeptIdAndRoleId(Long.valueOf(resourceMountApplyDTO.getDeptId()), roleDTO.getId());
|
SysUserDTO userDTO = sysUserService.getByDeptIdAndRoleId(Long.valueOf(resourceMountApplyDTO.getDeptId()), roleDTO.getId());
|
||||||
|
@ -226,6 +227,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
|
||||||
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
||||||
logger.error("未查到部门对应 " + resourceMountApplyDTO.getDeptId());
|
logger.error("未查到部门对应 " + resourceMountApplyDTO.getDeptId());
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.error("大数据局名称:" + bigDateDeptName);
|
logger.error("大数据局名称:" + bigDateDeptName);
|
||||||
|
@ -241,6 +243,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
|
||||||
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
|
||||||
logger.error("未查到大数据部门对应 " + roleName);
|
logger.error("未查到大数据部门对应 " + roleName);
|
||||||
assignee = defaultAssigneeRoleId;
|
assignee = defaultAssigneeRoleId;
|
||||||
|
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue