From 08e6cbcce20424b425a34514f851e7a6d53c9b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 1 Nov 2023 16:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/impl/SysUserServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index 965262da..bbf331e5 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -360,17 +360,17 @@ public class SysUserServiceImpl extends ServiceImpl i for (SysDeptEntity entity : deptEntities){ List models = this.getUserAuthList(String.valueOf(entity.getDeptId())); for(UserModel model : models) { - if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) { + if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDId()))) { userModels.add(model); - if(!model.getDeptId().equals(model.getDId())){ - UserModel userModel = new UserModel(); - userModel.setUserId(model.getUserId()); - userModel.setLoginname(model.getLoginname()); - userModel.setUsername(model.getUsername()); - userModel.setDeptId(model.getDId()); - userModels.add(userModel); - } +// if(!model.getDeptId().equals(model.getDId())){ +// UserModel userModel = new UserModel(); +// userModel.setUserId(model.getUserId()); +// userModel.setLoginname(model.getLoginname()); +// userModel.setUsername(model.getUsername()); +// userModel.setDeptId(model.getDId()); +// userModels.add(userModel); +// } } }