Compare commits
No commits in common. "3ccdca54c5a26a4d9824bbfd768d22d2b96e54f1" and "d8bff2e17e8d7b16d05416062182ed7dba5c5a61" have entirely different histories.
3ccdca54c5
...
d8bff2e17e
|
@ -286,7 +286,7 @@ public class TAbilityApplicationController {
|
||||||
@GetMapping("getByApplyFlag/{applyFlag}")
|
@GetMapping("getByApplyFlag/{applyFlag}")
|
||||||
@ApiOperation("根据申请标识获取能力申请信息")
|
@ApiOperation("根据申请标识获取能力申请信息")
|
||||||
@LogOperation("根据申请标识获取能力申请信息")
|
@LogOperation("根据申请标识获取能力申请信息")
|
||||||
public Result<TAbilityApplicationV2DTO> getByApplyFlag(@PathVariable("applyFlag") String applyFlag, @RequestParam Map<String, Object> requestParams) {
|
public Result<TAbilityApplicationV2DTO> getByApplyFlag(@PathVariable("applyFlag") String applyFlag) {
|
||||||
final UserDetail user = SecurityUser.getUser();
|
final UserDetail user = SecurityUser.getUser();
|
||||||
Map<String, Object> params = new HashMap<String, Object>() {
|
Map<String, Object> params = new HashMap<String, Object>() {
|
||||||
{
|
{
|
||||||
|
@ -309,14 +309,6 @@ public class TAbilityApplicationController {
|
||||||
return sysDeptDTO.getName();
|
return sysDeptDTO.getName();
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (requestParams.containsKey("resourceDeptName") && StringUtils.isNotEmpty(requestParams.get("resourceDeptName").toString())) { // 限制只出该资源所属部门的申请情况
|
|
||||||
Map<String, List<TAbilityApplicationDTO>> finalResult = result;
|
|
||||||
result = new HashMap<String, List<TAbilityApplicationDTO>>() {{
|
|
||||||
put(requestParams.get("resourceDeptName").toString(), finalResult.get(requestParams.get("resourceDeptName").toString()));
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (applicationDTOS.isEmpty()) {
|
if (applicationDTOS.isEmpty()) {
|
||||||
return new Result<TAbilityApplicationV2DTO>().ok(null);
|
return new Result<TAbilityApplicationV2DTO>().ok(null);
|
||||||
}
|
}
|
||||||
|
@ -330,9 +322,8 @@ public class TAbilityApplicationController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Map<String, List<TAbilityApplicationDTO>> finalResult1 = result;
|
|
||||||
Map<String, List<Map<String, Object>>> re = result.keySet().stream().map(index -> {
|
Map<String, List<Map<String, Object>>> re = result.keySet().stream().map(index -> {
|
||||||
final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = finalResult1.get(index);
|
final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = result.get(index);
|
||||||
if (tAbilityApplicationDTOList.isEmpty()) {
|
if (tAbilityApplicationDTOList.isEmpty()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue