From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 6824987..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,13 +2,18 @@
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;
+import com.ruoyi.system.api.model.QwUserDetailDto;
import com.ruoyi.system.api.service.RemoteUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* 用户服务
@@ -67,9 +72,29 @@
}
@Override
- public R frozenUser(Long userId) {
+ public R frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto) {
return R.fail("冻结用户失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<QwH5LoginVo> qwH5StaffLogin(QwUserDetailDto qwUserDetail) {
+ return R.fail("员工端登录信息获取失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<List<Long>> getUserIdsByDept(Long userId) {
+ 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