wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-26 13:54:27 +08:00
parent c0c539da01 59a15e2ce9
commit c2a14a1d2c
6 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/modules/demanData/listener/DemandDataListener.java
View File

@ -146,6 +146,7 @@ public class DemandDataListener implements TaskListener, ExecutionListener, Acti
logger.error("未查到该部门对应的{} ", roleName);
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
} else { // 填入大数据审批人
logger.error("大数据局名称：{}", bigDateDeptName);
@ -157,10 +158,12 @@ public class DemandDataListener implements TaskListener, ExecutionListener, Acti
logger.error("大数据审批人id:{}", userDTO.getId());
taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
assignee = userDTO.getId().toString();
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
} else {
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
logger.error("未查到大数据部门对应 {}", roleName);
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
}

1
renren-admin/src/main/java/io/renren/modules/demandComment/listener/CommentListener.java
View File

@ -142,6 +142,7 @@ public class CommentListener implements TaskListener, ExecutionListener, Activit
delegateTask.setAssignee(defaultAssigneeRoleId);
logger.error("未查到该部门对应 {}", roleName);
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
Map<String, Object> kv = delegateTask.getVariables();

1
renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java
View File

@ -113,6 +113,7 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
logger.error("审批人id:" + userDTO.getId());
taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
assignee = userDTO.getId().toString();
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
} else {
delegateTask.setAssignee(defaultAssigneeRoleId);
logger.error("未查到该部门对应 " + roleName);

1
renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java
View File

@ -185,6 +185,7 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
logger.error("未查到该部门 {} 对应的 {}", deptId, roleName);
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
if (kv.containsKey("tAbilityApplicationDTOList")) {
List<TAbilityApplicationDTO> dtoList = (List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList");

2
renren-admin/src/main/java/io/renren/modules/resource/listener/ResourceUndercarriageListener.java
View File

@ -143,9 +143,11 @@ public class ResourceUndercarriageListener implements TaskListener, ExecutionLis
} else {
logger.error("未查到该部门对应的 " + roleName + " 将使用大数据部门审核人");
assignee = defaultUser(delegateTask.getId(), roleDTO);
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
} else {
assignee = defaultUser(delegateTask.getId(), roleDTO);
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
if (StringUtils.isNotEmpty(assignee)

3
renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java
View File

@ -215,6 +215,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
logger.error("未查到该部门对应的 " + roleName);
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
} else if (resourceMountApplyDTO.getDeptId() != null) {
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);
logger.error("未查到部门对应 " + resourceMountApplyDTO.getDeptId());
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
} else {
logger.error("大数据局名称：" + bigDateDeptName);
@ -241,6 +243,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
logger.error("未查到大数据部门对应 " + roleName);
assignee = defaultAssigneeRoleId;
taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
}
}