From 3f47a0ee182e1f4bb693c0b0540c27362529bf9a Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 20 Nov 2025 10:27:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/command/query/UserQueryExe.java | 2 ++ .../main/java/com/zcloud/basic/info/dto/UserPageQry.java | 1 + .../java/com/zcloud/basic/info/domain/model/UserE.java | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 2450bc6..86b9be8 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -47,6 +47,8 @@ public class UserQueryExe { */ public PageResponse execute(UserPageQry userPageQry) { Map params = PageQueryHelper.toHashMap(userPageQry); + UserE userE = new UserE(); + userE.dataProcessingRights(AuthContext.getTenantId(), params); PageResponse pageResponse = userRepository.listPage(params); List examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index d5e5a0b..e93d2a9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -27,6 +27,7 @@ public class UserPageQry extends PageQuery { private Long eqDepartmentId; private Long eqPostId; private String likeName; + private Integer allFlag; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index 3c7283b..1f89c1c 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -131,7 +131,6 @@ public class UserE extends BaseE { private Integer employmentFlag; - public void initAdd(Long tenantId, UserE userE) { userE.setUserId(Tools.get32UUID()); userE.setTenantId(!ObjectUtils.isEmpty(userE.getTenantId())? userE.getTenantId() : tenantId); @@ -328,5 +327,11 @@ public class UserE extends BaseE { this.setOrgId(examTypeE.getTenantId()); this.setTenantId(examTypeE.getTenantId()); } + + public void dataProcessingRights(Long tenantId, Map params) { + if (ObjectUtils.isEmpty(params.get("allFlag")) && ObjectUtils.isEmpty(params.get("eqCorpinfoId"))){ + params.put("eqCorpinfoId", tenantId); + } + } }