deptId和did互换

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -360,7 +360,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
         for (SysDeptEntity entity : deptEntities){
             List<UserModel> 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())){

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