Commit ec9a6476 authored by 韩桐桐's avatar 韩桐桐

fix(jg):设备类别查询修改入参

parent 0120fffc
...@@ -124,7 +124,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -124,7 +124,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
@GetMapping(value = "/equ-category/listByPersonAndEquList") @GetMapping(value = "/equ-category/listByPersonAndEquList")
@ApiOperation(httpMethod = "GET", value = "按照人员身份、设备种类查询设备类别", notes = "按照人员身份、设备种类查询设备类别") @ApiOperation(httpMethod = "GET", value = "按照人员身份、设备种类查询设备类别", notes = "按照人员身份、设备种类查询设备类别")
public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList, public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList,
@RequestParam(value = "businessScenarios") String businessScenarios) { @RequestParam(value = "businessScenarios",required = false) String businessScenarios) {
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios)); return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios));
} }
......
...@@ -503,7 +503,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -503,7 +503,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
} }
String dictCode = String.format("%s_%s", dictCodePrefix, equipAddDictCodeSuffix); String dictCode = String.format("%s_%s", dictCodePrefix, equipAddDictCodeSuffix);
List<DictionarieValueModel> result = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(dictCode)); List<DictionarieValueModel> result = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(dictCode));
if (CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType) ){ if (CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType) || ValidationUtil.isEmpty(businessScenarios)){
return result; return result;
} }
// 初始化collect列表 // 初始化collect列表
......
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