Commit 0472be9c authored by tianyiming's avatar tianyiming

修改bug

parent 2b3c072b
......@@ -832,7 +832,7 @@ public class FireFightingSystemController extends AbstractBaseController {
@ApiOperation(httpMethod = "GET", value = "获取系统分类树", notes = "获取系统分类树")
@GetMapping(value = "/systemAndEquipmentTreeByBziOrgCode")
public List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode() {
return fireFightingSystemService.systemAndEquipmentTreeByBziOrgCode(bizOrgCode);
return fireFightingSystemService.systemAndEquipmentTreeByBziOrgCode();
}
/**
......
......@@ -284,7 +284,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
Page<Map<String, Object>> getSystemInfo(Page page, String companyCode, String systemCode);
List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode(String bizOrgCode);
List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode();
Map<String, Object> getSystemDetailByCode(String systemCode);
......
......@@ -1991,7 +1991,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
@Override
public List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode(String bizOrgCode) {
public List<OrgMenuDto> systemAndEquipmentTreeByBziOrgCode() {
FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, "COMPANY", "dl");
String bizOrgCode = feignClientResult.getResult().get(0).getBizOrgCode();
List<Map<String, Object>> list = fireFightingSystemMapper.systemAndEquipment(bizOrgCode);
return systemAndEquipmentTree(list);
}
......
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