wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: (REQ-3300) 详情页按钮放开

Browse Source
This commit is contained in:
xudawei 2025-02-14 18:23:11 +08:00
parent 3170512986
commit 9faf2a277f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java
View File

@ -357,7 +357,12 @@ public class VisaDetailByIdResponse {
if (CollectionUtils.isEmpty(professionalList)) {
return Lists.newArrayList();
}
return professionalList;
List<RelationProfessionalDetail> filter = professionalList.stream().filter(item -> Objects.nonNull(item) && StringUtils.isNotBlank(item.getCode())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(filter)) {
return Lists.newArrayList();
}
return filter;
}
/**
@ -407,7 +412,11 @@ public class VisaDetailByIdResponse {
if (CollectionUtils.isEmpty(relationAreaList)) {
return Lists.newArrayList();
}
return relationAreaList;
List<RelationAreaDetail> filter = relationAreaList.stream().filter(item -> Objects.nonNull(item) && Objects.nonNull(item.getAreaId())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(filter)) {
return Lists.newArrayList();
}
return filter;
}
public static List<Long> buildAreaWithId(JSONArray relationArea) {

4
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
View File

@ -87,8 +87,8 @@ public class ChangeRecordController implements ChangeRecordApi {
@Override
public ApiResult<VisaDetailByIdResponse> visaDetailById(@RequestBody @Valid VisaDetailByIdRequest req) {
VisaDetailByIdResponse resp = changeRecordService.detailById(req.getVisaId());
resp.setBtnList(VisaButtonTypeEnum.all());
// resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
// resp.setBtnList(VisaButtonTypeEnum.all());
resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus()));
return ApiResult.ok(resp);
}