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-08-22 10:14:36 +08:00
parent cad9bf4ae0 81db400dec
commit 3e18ec9b8e
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
View File

@ -128,7 +128,13 @@ public class ActivitiNoticeAspect {
private void task_complete_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { private void task_complete_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) {
Map<String, Object> kv = delegateTask.getVariables(); Map<String, Object> kv = delegateTask.getVariables();
LOGGER.error("表单：{}", JSON.toJSONString(kv)); LOGGER.error("表单：{}", JSON.toJSONString(kv));
final String workKey = TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString(); String key = null;
if (kv.containsKey("id")) {
key = kv.getOrDefault("id", "").toString();
} else if (kv.containsKey("_id")) {
key = kv.getOrDefault("_id", "").toString();
}
final String workKey = TaskListener.EVENTNAME_COMPLETE + key;
if (work.contains(workKey)) { if (work.contains(workKey)) {
LOGGER.error("------------出现重放------------"); LOGGER.error("------------出现重放------------");
return; return;
@ -167,8 +173,6 @@ public class ActivitiNoticeAspect {
String finalResult = result; String finalResult = result;
CompletableFuture.runAsync(() -> { // 发起人 CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
kv.get("resourceId");
kv.get("id");
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult; String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO(); SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2); dto.setType(2);
@ -209,7 +213,13 @@ public class ActivitiNoticeAspect {
private void end_notice(final DelegateExecution execution, final ActivitiNoticeOperation activitiNoticeOperation) { private void end_notice(final DelegateExecution execution, final ActivitiNoticeOperation activitiNoticeOperation) {
Map<String, Object> kv = execution.getVariables(); Map<String, Object> kv = execution.getVariables();
LOGGER.error("表单：{}", JSON.toJSONString(kv)); LOGGER.error("表单：{}", JSON.toJSONString(kv));
final String workKey = ExecutionListener.EVENTNAME_END + kv.get("id").toString(); String key = null;
if (kv.containsKey("id")) {
key = kv.getOrDefault("id", "").toString();
} else if (kv.containsKey("_id")) {
key = kv.getOrDefault("_id", "").toString();
}
final String workKey = ExecutionListener.EVENTNAME_END + key;
if (work.contains(workKey)) { if (work.contains(workKey)) {
LOGGER.error("------------出现重放------------"); LOGGER.error("------------出现重放------------");
return; return;
@ -248,8 +258,6 @@ public class ActivitiNoticeAspect {
String finalResult = result; String finalResult = result;
CompletableFuture.runAsync(() -> { // 发起人 CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
kv.get("resourceId");
kv.get("id");
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult; String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO(); SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2); dto.setType(2);
@ -315,7 +323,13 @@ public class ActivitiNoticeAspect {
private void assignment_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { private void assignment_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) {
Map<String, Object> kv = delegateTask.getVariables(); Map<String, Object> kv = delegateTask.getVariables();
LOGGER.error("表单：{}", JSON.toJSONString(kv)); LOGGER.error("表单：{}", JSON.toJSONString(kv));
final String workKey = TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString(); String key = null;
if (kv.containsKey("id")) {
key = kv.getOrDefault("id", "").toString();
} else if (kv.containsKey("_id")) {
key = kv.getOrDefault("_id", "").toString();
}
final String workKey = TaskListener.EVENTNAME_ASSIGNMENT + key;
if (work.contains(workKey)) { if (work.contains(workKey)) {
LOGGER.error("------------出现重放------------"); LOGGER.error("------------出现重放------------");
return; return;

3
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java
View File

@ -262,7 +262,8 @@ public class AbilityCenterControllerV2 {
put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请 put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请
put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id
put("deptId", deptId); // 归属部门 put("deptId", deptId); // 归属部门
// put("id", applyFlag); //申请id put("id", applyFlag); //申请id
put("_id", applyFlag); //申请id
put("creator", user == null ? null : user.getId().toString()); // 创建人 put("creator", user == null ? null : user.getId().toString()); // 创建人
put("userId", user == null ? null : user.getId().toString()); // 创建人 put("userId", user == null ? null : user.getId().toString()); // 创建人
put("basic_facilities", basicFacilities); // 是否为基础设施 put("basic_facilities", basicFacilities); // 是否为基础设施

2
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
View File

@ -297,7 +297,7 @@ public class AbilityCenterControllerV3 {
put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请 put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请
put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id
put("deptId", deptId); // 归属部门 put("deptId", deptId); // 归属部门
// put("id", applyFlag); //申请id put("_id", applyFlag); //申请id
put("creator", user == null ? null : user.getId().toString()); // 创建人 put("creator", user == null ? null : user.getId().toString()); // 创建人
put("userId", user == null ? null : user.getId().toString()); // 创建人 put("userId", user == null ? null : user.getId().toString()); // 创建人
put("userDeptId", user == null ? null : user.getDeptId().toString()); // 发起人部门id put("userDeptId", user == null ? null : user.getDeptId().toString()); // 发起人部门id