From 4805515779a0c3cd01ae129bf1750ca37f3a3778 Mon Sep 17 00:00:00 2001 From: Parker Date: Sat, 19 Dec 2020 15:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=20=E6=88=96=E8=80=85=20=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/user/service/impl/UserServiceImpl.java | 3 +++ .../system/user/web/UserRestController.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java index 0d85032f..5aec8e71 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java @@ -146,6 +146,9 @@ public class UserServiceImpl extends CrudServiceImpl queryBuilder = new GenQueryBuilder<>(); QueryWrapper queryWrapper = queryBuilder.build(); queryWrapper.eq(key, username); + queryWrapper.eq( + HumpUtil.humpToUnderline(MyBatisConstants.FIELD_DELETE_LOGIC) + , "0"); SysUser user = this.getOne(queryWrapper); return super.transformT2M(user); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java index e83270b2..4595a45e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java @@ -360,6 +360,12 @@ public class UserRestController extends BaseRestController