Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -60,7 +60,7 @@ public interface SysUserFeignService {
 
 	@PostMapping(value = "user/getTenantByClient")
 	@ApiOperation(value = "获取机构编号")
-	Long getTenantByClient(@RequestParam("userId")Long userId,@RequestParam("clientId")String clientId);
+	HttpResponseResult<Long> getTenantByClient(@RequestParam("userId")Long userId,@RequestParam("clientId")String clientId);
 
 	@GetMapping(value = "exit")
 	@ApiOperation(value = "退出登录")

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -68,8 +68,8 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return HttpResponseResult.failed("请求失败");
 	}
 
-	public Long getTenantByClient(Long userId,String clientId){
-		return -1l;
+	public HttpResponseResult<Long> getTenantByClient(Long userId,String clientId){
+		return HttpResponseResult.succeed(-1L);
 	}
 
 	@Override

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -136,8 +136,8 @@ public class UserController extends BaseController {
     }
 
     @PostMapping(value = "/getTenantByClient", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    public Long getTenantByClient(Long userId,String clientId) {
-        return sysUserService.getTenantByClient(userId,clientId);
+    public HttpResponseResult<Long> getTenantByClient(Long userId,String clientId) {
+        return HttpResponseResult.succeed(sysUserService.getTenantByClient(userId,clientId));
     }
 
     @PostMapping(value = "/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -61,7 +61,7 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public Long getTenantByClient(Long userId, String clientId) {
-        return sysUserFeignService.getTenantByClient(userId,clientId);
+        return sysUserFeignService.getTenantByClient(userId,clientId).getData();
     }
 
     @Override