From 1e228c1191996a8e704cf36dc8042b1c6ca81ef1 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 04 Nov 2020 10:59:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java
index dcc8b33..8b892a4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java
@@ -1,13 +1,12 @@
package com.kidgrow.oprationcenter.feign.fallback;
-import com.kidgrow.common.model.SysRole;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@Slf4j
@Component
@@ -16,7 +15,7 @@
public RoleOrganizationService create(Throwable throwable) {
return new RoleOrganizationService() {
@Override
- public Map<String, Object> getRoleOrgMap(List<SysRole> list) {
+ public Map<String, Object> getRoleOrgMap(SysUser sysUser) {
Map<String, Object> map=new HashMap<>();
map.put("id",null);
return map;
--
Gitblit v1.8.0