From 5c14e5caa0c797f9ef4045414e581877f20c8bf7 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 1 Dec 2025 15:41:15 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/command/query/UserQueryExe.java | 8 +++++++- .../com/zcloud/basic/info/dto/UserCheckPassWordCmd.java | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) 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 633abaa..fbe01a5 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 @@ -1,5 +1,6 @@ package com.zcloud.basic.info.command.query; +import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; @@ -53,6 +54,9 @@ public class UserQueryExe { userE.dataProcessingRights(AuthContext.getTenantId(), params); PageResponse pageResponse = userRepository.listPage(params); List examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData()); + if(CollUtil.isNotEmpty(examCenterCOS)){ + examCenterCOS.forEach(this::desensitize); + } return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -70,7 +74,9 @@ public class UserQueryExe { List imgFilesCOList = userCoConvertor.converDOsToCOs(imgFilesDOList); //手机号脱敏 //身份照脱敏 - imgFilesCOList.forEach(this::desensitize); + if(CollUtil.isNotEmpty(imgFilesCOList)){ + imgFilesCOList.forEach(this::desensitize); + } return MultiResponse.of(imgFilesCOList); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserCheckPassWordCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserCheckPassWordCmd.java index d569c98..0a5326e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserCheckPassWordCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserCheckPassWordCmd.java @@ -24,8 +24,8 @@ public class UserCheckPassWordCmd extends Command { @ApiModelProperty(value = "GBS用户id", name = "id", required = true) @NotNull(message = "GBS用户id不能为空") private Long id; - @ApiModelProperty(value = "原密码", name = "password") - @NotEmpty(message = "原密码不能为空") + @ApiModelProperty(value = "密码", name = "password") + @NotEmpty(message = "密码不能为空") private String password; }