修复新增物料查询oms字段报错问题
This commit is contained in:
+22
@@ -61,6 +61,28 @@ public class ErpCountryApplicationService{
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public TableDataInfo queryList1(ErpCountryDTO erpCountryDTO) {
|
||||||
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
|
if (loginUser != null) {
|
||||||
|
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
|
||||||
|
if (topOrganizationId != null && topOrganizationId != 1) {
|
||||||
|
erpCountryDTO.setTopOrganizationId(topOrganizationId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
List<ErpCountryPO> list = erpCountryMapper.queryList(erpCountryDTO);
|
||||||
|
|
||||||
|
|
||||||
|
TableDataInfo tableDataInfo = new TableDataInfo();
|
||||||
|
tableDataInfo.setData(list);
|
||||||
|
tableDataInfo.setCode(200);
|
||||||
|
return tableDataInfo;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int insert(ErpCountryDTO erpCountryDTO) {
|
public int insert(ErpCountryDTO erpCountryDTO) {
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public class ErpCountryApi extends BaseController{
|
|||||||
@ApiOperation("查询企业国别列表-下拉框用")
|
@ApiOperation("查询企业国别列表-下拉框用")
|
||||||
@GetMapping("/countryList")
|
@GetMapping("/countryList")
|
||||||
public AjaxResult countryList(ErpCountryDTO erpCountryDTO){
|
public AjaxResult countryList(ErpCountryDTO erpCountryDTO){
|
||||||
TableDataInfo tableDataInfo = erpCountryApplicationService.queryList(erpCountryDTO);
|
TableDataInfo tableDataInfo = erpCountryApplicationService.queryList1(erpCountryDTO);
|
||||||
return AjaxResult.success(tableDataInfo.getData());
|
return AjaxResult.success(tableDataInfo.getData());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user