diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java index 75ce478..4825fad 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java @@ -44,9 +44,16 @@ public class UserCertificateController { @PostMapping("/list") @PreAuthorize("@pms.hasAnyPermission('gfd-tzzyrugl', 'gfd-tzsbczrygl', 'gfd-qyzyfzrgl','gfd-qyaqscglrygl', 'qyd-tzzyrugl', 'qyd-tzsbczrygl', 'qyd-zyfzrgl','qyd-aqscglrygl', 'xgfd-zyfzrgl', 'xgfd-tzzzsbczrygl', 'xgfd-aqscglrygl','xgfd-tzzyrugl')") public PageResponse page(@RequestBody UserCertificatePageQry qry) { - return userCertificateService.listPage(qry); + return userCertificateService.listPage(qry, true); } + @ApiOperation("分页-无权限") + @PostMapping("/listPage") + public PageResponse listPage(@RequestBody UserCertificatePageQry qry) { + return userCertificateService.listPage(qry, false); + } + + @ApiOperation("所有数据") @PostMapping("/listAll") public MultiResponse listAll(@RequestBody UserCertificatePageQry qry) { diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java index 3bb0be4..53ca180 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java @@ -57,7 +57,7 @@ public class UserCertificateQueryExe { * * @return */ - public PageResponse execute(UserCertificatePageQry qry) { + public PageResponse execute(UserCertificatePageQry qry, boolean withPermission) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (qry.getIsAppQuery() != null) { qry.setEqUserId(ssoUser != null ? ssoUser.getUserId() : null); @@ -67,7 +67,10 @@ public class UserCertificateQueryExe { Map params = PageQueryHelper.toHashMap(qry); - PageResponse iPage = userCertificateRepository.listPageWithUser(params); + // 根据权限控制标识调用不同的 repository 方法 + PageResponse iPage = withPermission + ? userCertificateRepository.listPageWithUser(params) + : userCertificateRepository.listPageUser(params); List userCertificateES = userCertificateCoConvertor.converDOsToEs(iPage.getData()); List userIds = userCertificateES.stream().map(UserCertificateE::getUserId).distinct().collect(Collectors.toList()); diff --git a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java index ef6ded7..76316a8 100644 --- a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java @@ -39,9 +39,9 @@ public class UserCertificateServiceImpl implements UserCertificateServiceI { } @Override - public PageResponse listPage(UserCertificatePageQry qry){ + public PageResponse listPage(UserCertificatePageQry qry, boolean withPermission){ - return userCertificateQueryExe.execute(qry); + return userCertificateQueryExe.execute(qry, withPermission); } @Override diff --git a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java index e065faa..2bb3479 100644 --- a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java +++ b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java @@ -20,7 +20,7 @@ import java.util.List; public interface UserCertificateServiceI { UserCertificateCO queryById(Long id); - PageResponse listPage(UserCertificatePageQry qry); + PageResponse listPage(UserCertificatePageQry qry, boolean withPermission); SingleResponse add(UserCertificateAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java index bede566..f6167fe 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java @@ -75,5 +75,11 @@ public class UserCertificatePageQry extends PageQuery { */ @ApiModelProperty(value = "用户ids", name = "inUserIds") private List inUserId;; + + /** + * 证书类型集合 + */ + @ApiModelProperty(value = "证书类型集合", name = "inCertificateTypes") + private List inType; } diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java index 31112a4..0e6aa85 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java @@ -33,6 +33,11 @@ public interface UserCertificateMapper extends BaseMapper { */ IPage selectPageWithUser(IPage page, @Param("params") Map params); + /** + * 分页查询用户证书信息,包含用户名称,无权限控制 + */ + IPage selectPageUser(IPage page, @Param("params") Map params); + /** * 根据企业/相关方类型查询各企业/相关方各类人员证书数量 */ diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java index 86173d3..44d0472 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java @@ -27,6 +27,11 @@ public interface UserCertificateRepository extends BaseRepository listPageWithUser(Map params); + /** + * 分页查询包含用户信息,无权限控制 + */ + PageResponse listPageUser(Map params); + /** * 根据企业/相关方类型查询各企业/相关方各类人员证书数量 */ diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java index b19aae9..98bf212 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java @@ -50,6 +50,13 @@ public class UserCertificateRepositoryImpl extends BaseRepositoryImpl listPageUser(Map params) { + IPage page = new Query().getPage(params); + IPage iPage = userCertificateMapper.selectPageUser(page, params); + return PageHelper.pageToResponse(iPage, iPage.getRecords()); + } + @Override public PageResponse selectCorpCertificateStatPage(Map params) { IPage page = new Query().getPage(params); diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index 3af8695..ba5756f 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -55,6 +55,63 @@ ORDER BY uc.create_time DESC + + +