From bed94e9fe8ac9af9a7fb7868c7437c2314551f99 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 17:22:49 +0800 Subject: [PATCH] =?UTF-8?q?deptId=E5=92=8Cdid=E4=BA=92=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java | 2 +- dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 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 bbf331e5..e10fb10d 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,7 +360,7 @@ 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.getDId()))) { + if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) { userModels.add(model); // if(!model.getDeptId().equals(model.getDId())){ diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml index 40940bc4..81be0ce3 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserDao.xml @@ -74,8 +74,8 @@ u.user_id, u.username, u.loginname, - u.dept_id, - d.dept_id as dId + u.dept_id as dId, + d.dept_id FROM sys_user u INNER JOIN sys_user_org d ON u.user_id = d.userid