From 6b7edc713a252d1f6a4ba1555e113e08ec680377 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Wed, 9 Nov 2022 10:36:52 +0800 Subject: [PATCH] =?UTF-8?q?API=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=8E=89?= =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xiaoleilu/loServer/action/admin/GetUserAction.java | 2 +- .../com/xiaoleilu/loServer/action/channel/GetUserAction.java | 2 +- .../java/com/xiaoleilu/loServer/action/robot/GetUserAction.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java index b5189df7..700dfc5c 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java @@ -49,7 +49,7 @@ public class GetUserAction extends AdminAction { } RestResult result; - if (user == null) { + if (user == null || user.getDeleted() > 0) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } else { result = RestResult.ok(InputOutputUserInfo.fromPbUser(user)); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java index 72a23976..df1b43a3 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java @@ -44,7 +44,7 @@ public class GetUserAction extends ChannelAction { RestResult result; - if (user == null || StringUtil.isNullOrEmpty(user.getName())) { + if (user == null || StringUtil.isNullOrEmpty(user.getName()) || user.getDeleted() > 0) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } else { if (channelInfo.getOwner().equals(inputUserId.getUserId()) || diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java index 193d7465..d41529ec 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java @@ -44,7 +44,7 @@ public class GetUserAction extends RobotAction { } RestResult result; - if (user == null) { + if (user == null || user.getDeleted() > 0) { result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST); } else { result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));