diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java index f3002752..299c4e05 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java @@ -110,6 +110,11 @@ public class VisaChangePageSearchReq { */ private Collection visaIds; + /** + * 变更签证Id集合-权限 + */ + private Collection permissionVisaIds; + /** * 是否需要主单据(即是否被其他单据关联)信息 */ diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index e585c566..e8d0103d 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -118,6 +118,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.groovy.util.Maps; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -176,6 +178,7 @@ import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.PROCES */ @Slf4j @Service +@RefreshScope public class ChangeRecordServiceImpl extends ServiceImpl implements ChangeRecordService { @Resource @@ -246,6 +249,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl permissionVisaIdSet = this.fetchPermissionVisaIdSet(req); -// if (CollectionUtils.isEmpty(permissionVisaIdSet)) { -// return PageData.builder() -// .page(Math.toIntExact(req.getPage())) -// .pageSize(Math.toIntExact(req.getPageSize())) -// .totalCount(0L) -// .list(Lists.newArrayList()) -// .build(); -// } + if (permissionDataFlag) { + Set permissionVisaIdSet = this.fetchPermissionVisaIdSet(req); + if (CollectionUtils.isEmpty(permissionVisaIdSet)) { + return PageData.builder() + .page(Math.toIntExact(req.getPage())) + .pageSize(Math.toIntExact(req.getPageSize())) + .totalCount(0L) + .list(Lists.newArrayList()) + .build(); + } + } + /*数据查询*/ Page page = getFilter(req).page(new Page<>(req.getPage(), req.getPageSize())); return PageData.builder() @@ -1051,13 +1059,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl permissionVisaIdSet = this.fetchPermissionVisaIdSet(filter); - List changeRecordList = Lists.newArrayList(); -// if (CollectionUtils.isNotEmpty(permissionVisaIdSet)) { -// /*获取数据*/ -// changeRecordList = getFilter(filter,permissionVisaIdSet).list(); -// } - changeRecordList = getFilter(filter).list(); + if (permissionDataFlag) { + Set permissionVisaIdSet = this.fetchPermissionVisaIdSet(filter); + if (CollectionUtils.isEmpty(permissionVisaIdSet)) { + return Lists.newArrayList(); + } + } + List changeRecordList = getFilter(filter).list(); if (CollectionUtils.isEmpty(changeRecordList)) { return Collections.emptyList(); } @@ -1097,15 +1105,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl permissionVisaIdSet = this.fetchPermissionVisaIdSet(filter); - List changeRecordList = Lists.newArrayList(); -// if (CollectionUtils.isNotEmpty(permissionVisaIdSet)) { -// /*获取数据*/ -// changeRecordList = getFilter(filter,permissionVisaIdSet).list(); -// } + if (permissionDataFlag) { + Set permissionVisaIdSet = this.fetchPermissionVisaIdSet(filter); + AssertUtil.notEmpty(permissionVisaIdSet, "没有数据需要导出"); + } /*获取数据*/ - changeRecordList = getFilter(filter).list(); + List changeRecordList = getFilter(filter).list(); AssertUtil.notEmpty(changeRecordList, "没有数据需要导出"); /*数据转换*/ @@ -1174,6 +1180,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl getFilter(VisaChangePageSearchReq filter) { LambdaQueryChainWrapper queryChainWrapper = lambdaQuery() + .in(CollectionUtils.isNotEmpty(filter.getPermissionVisaIds()), ChangeRecord::getId, filter.getPermissionVisaIds()) .eq(Objects.nonNull(filter.getVisaId()), ChangeRecord::getId, filter.getVisaId()) .eq(NumberUtil.isPositiveNumber(filter.getWorkspaceId()), ChangeRecord::getRelationWorkspaceId, filter.getWorkspaceId()) .eq(Objects.nonNull(filter.getType()), ChangeRecord::getType, filter.getType()) @@ -1237,6 +1244,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl