From 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java |   31 +++++--------------------------
 1 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index d8d4994..bf86892 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -4,7 +4,6 @@
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.api.model.*;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
@@ -14,11 +13,6 @@
     @Override
     public SysUserClient create(Throwable cause) {
         return new SysUserClient(){
-
-            @Override
-            public R<List<CompanyUserListVo>> getSysUserFromCompanyId(CompanySysUserReq companySysUserReq) {
-                return R.fail("公司获取关联已有账号失败:" + cause.getMessage());
-            }
 
             @Override
             public R<SysUser> getSysUser(Long userId) {
@@ -31,23 +25,8 @@
             }
 
             @Override
-            public R<List<Integer>> companySaveSysUser(CompanyAddSysUserDto dto) {
-                return R.fail("添加用户失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<Integer>> addTRepairSysUser(TRepairShopAddDto dto) {
-                return R.fail("添加修理厂用户失败:" + cause.getMessage());
-            }
-
-            @Override
             public R<List<SysUser>> getUserList(List<Integer> userIds) {
                 return R.fail("通过用户id集合查询用户失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<List<CompanyUserListVo>> getSysUserFromCompanyIdOne(CompanySysUserReq companySysUserReq) {
-                return R.fail("公司获取账号失败:" + cause.getMessage());
             }
 
             @Override
@@ -76,11 +55,6 @@
             }
 
             @Override
-            public R<Boolean> addUserRole(List<SysUserRoleDTO> dtoList) {
-                return R.fail("默认批量添加修理厂失败:" + cause.getMessage());
-            }
-
-            @Override
             public R<SysUser> queryUserByPhone(String phone) {
                 return R.fail("通过手机号查询用户失败:" + cause.getMessage());
             }
@@ -99,6 +73,11 @@
             public R resetPassword(SysUser user) {
                 return R.fail("重置用户密码失败:" + cause.getMessage());
             }
+    
+            @Override
+            public R saveShopUser(SysUser user) {
+                return R.fail("新增加门店员工账号数据失败:" + cause.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1