From 945561a655919045c3086f00d7d16dbc1d24c23f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 10:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index 4d886f8..470a023 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.model.QwH5LoginVo;
@@ -71,7 +72,7 @@
}
@Override
- public R frozenUser(Long userId) {
+ public R frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto) {
return R.fail("冻结用户失败:" + throwable.getMessage());
}
@@ -82,9 +83,18 @@
@Override
public R<List<Long>> getUserIdsByDept(Long userId) {
- return null;
+ return R.fail("根据部门获取所有员工id信息获取失败:" + throwable.getMessage());
}
+ @Override
+ public R<List<SysUser>> getUsersByDeptId(Long deptId) {
+ return R.fail("根据部门id获取用户信息获取失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public List<Long> getScopeOfAuthorityUserId() {
+ return null;
+ }
};
}
}
--
Gitblit v1.7.1