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-07-20 16:34:28 +08:00
parent 16b12761b7 84d9562041
commit 7fd83391fb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ public class AbilityCenterControllerV2 {
index.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString()))
).collect(Collectors.toList());
abilityBatchApplicationDTO.setSystem(system); // 申请所有的正常的应用资源
logger.info("申请入参{}", JSON.toJSONString(abilityBatchApplicationDTO));
final String applyFlag = UUID.randomUUID().toString();
abilityBatchApplicationDTO.setApplyFlag(applyFlag); // 同一次的申请标识
final Optional<SysDeptDTO> deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName));
@ -129,7 +129,7 @@ public class AbilityCenterControllerV2 {
}
final String applyFlag = UUID.randomUUID().toString();
abilityBatchApplicationDTO.setApplyFlag(applyFlag); // 同一次的申请标识
logger.info("申请入参{}", JSON.toJSONString(abilityBatchApplicationDTO));
final Optional<SysDeptDTO> deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName));
final UserDetail user = SecurityUser.getUser();
CompletableFuture.runAsync(() -> {
@ -178,6 +178,7 @@ public class AbilityCenterControllerV2 {
ValidatorUtils.validateEntity(tAbilityApplicationDTO, AddGroup.class, DefaultGroup.class);
tAbilityApplicationService.save(tAbilityApplicationDTO); // 写能力申请数据
if (tAbilityApplicationDTO.getId() == null) {
logger.error("插入申请单失败!");
return null;
}
tAbilityApplicationDTO.setCompleteEntry(Boolean.TRUE);