Commit 697826ef authored by wujiang's avatar wujiang

修改获取监管机构接口

parent d7e19c1a
package com.yeejoin.amos.boot.module.tzs.biz.controller; package com.yeejoin.amos.boot.module.tzs.biz.controller;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -82,8 +84,8 @@ public class TzsAuthController extends BaseController { ...@@ -82,8 +84,8 @@ public class TzsAuthController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUserRegulator") @GetMapping(value = "/getUserRegulator")
@ApiOperation(httpMethod = "GET", value = "获取用户组织机构树", notes = "获取用户组织机构树") @ApiOperation(httpMethod = "GET", value = "获取用户组织机构树", notes = "获取用户组织机构树")
public ResponseModel<String> getUserRegulator () { public ResponseModel<Map<String,Object>> getUserRegulator () {
String name=""; Map<String,Object> map = new HashMap<String,Object>();
FeignClientResult<AgencyUserModel> result=Privilege.agencyUserClient.getme(); FeignClientResult<AgencyUserModel> result=Privilege.agencyUserClient.getme();
if(result.getResult()!=null) if(result.getResult()!=null)
{ {
...@@ -96,16 +98,16 @@ public class TzsAuthController extends BaseController { ...@@ -96,16 +98,16 @@ public class TzsAuthController extends BaseController {
FeignClientResult<CompanyModel> cResult =Privilege.companyClient.seleteOne(company.getParentId()); FeignClientResult<CompanyModel> cResult =Privilege.companyClient.seleteOne(company.getParentId());
if(cResult.getResult()!=null) if(cResult.getResult()!=null)
{ {
name = cResult.getResult().getCompanyName(); map.put("regulator", cResult.getResult().getCompanyName());
} }
}else }else
{ {
name=company.getCompanyName(); map.put("regulator",company.getCompanyName());
} }
map.put("company", company.getCompanyName());
} }
map.put("username", result.getResult().getRealName());
} }
result.getResult().getCompanys(); return ResponseHelper.buildResponse(map);
return ResponseHelper.buildResponse(name);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment