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

流程通知日志

This commit is contained in:
wangliwen 2022-06-27 17:26:31 +08:00
parent 316adc2c4a
commit d8611fb957
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package io.renren.common.aspect;
import com.alibaba.fastjson.JSON;
import io.renren.common.annotation.ActivitiNoticeOperation;
import io.renren.modules.notice.dto.SysNoticeDTO;
import io.renren.modules.notice.enums.NoticeStatusEnum;
@ -200,7 +201,7 @@ public class ActivitiNoticeAspect {
*/
private void end_notice(final DelegateExecution execution, final ActivitiNoticeOperation activitiNoticeOperation) {
Map<String, Object> kv = execution.getVariables();
logger.error("表单：" + kv.toString());
logger.error("表单：" + JSON.toJSONString(kv));
if (work_.contains(ExecutionListener.EVENTNAME_END + kv.get("id").toString())) {
logger.error("------------出现重放------------");
return;
@ -229,9 +230,9 @@ public class ActivitiNoticeAspect {
String finalCreator = creator;
String finalResult = result;
Long resourceId = null;
if (kv.containsKey("resourceId")) {
if (kv.containsKey("resourceId") && kv.get("resourceId") != null) {
resourceId = Long.valueOf(kv.get("resourceId").toString());
} else if (kv.containsKey("id")) {
} else if (kv.containsKey("id") && kv.get("id") != null) {
resourceId = Long.valueOf(kv.get("id").toString());
}
Optional<ResourceDTO> resourceDTO = Optional.ofNullable(resourceService.get(resourceId));

4
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java
View File

@ -78,6 +78,10 @@ public class AbilityCenterController {
return new Result().error("联系管理员添加流程");
}
return new Result().ok(abilityBatchApplicationDTO.getSystem().stream().map(index -> {
if (index.get("resourceId") == null) {
logger.error("未携带资源id");
return null;
}
if (tAbilityApplicationService.countUserResourceApply(SecurityUser.getUserId(), Long.valueOf(index.get("resourceId"))) > 0) { // 防止重复发起申请
logger.error("重复发起申请");
return null;