Commit 4cd1546f authored by chenzhao's avatar chenzhao

修改bug

parent e1d253cf
...@@ -673,7 +673,7 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe ...@@ -673,7 +673,7 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
categoryIdList = categorieChildren.stream().map(category -> category.getId()).collect(Collectors.toList()); categoryIdList = categorieChildren.stream().map(category -> category.getId()).collect(Collectors.toList());
categoryIdList.add(categoryRoot); categoryIdList.add(categoryRoot);
} }
List<HashMap<String,Object>> equipmentList = equipmentSpecificMapper.getEquipBySourceId(idsList, categoryIdList,equipCode == null ?equipCode:equipCode.replace(" ", ""), equipName == null ? equipName: equipName .replace(" ", ""),companyId,page.getCurrent(),page.getSize()); List<HashMap<String,Object>> equipmentList = equipmentSpecificMapper.getEquipBySourceId(idsList, categoryIdList,equipCode == null ?equipCode:equipCode.replace(" ", ""), equipName == null ? equipName: equipName .replace(" ", ""),companyId,(page.getCurrent()-1)*page.getSize(),page.getSize());
int total = equipmentSpecificMapper.getEquipBySourceIdCount(idsList, categoryIdList,equipCode == null ?equipCode:equipCode.replace(" ", ""), equipName == null ? equipName: equipName .replace(" ", ""),companyId); int total = equipmentSpecificMapper.getEquipBySourceIdCount(idsList, categoryIdList,equipCode == null ?equipCode:equipCode.replace(" ", ""), equipName == null ? equipName: equipName .replace(" ", ""),companyId);
page.setTotal(total); page.setTotal(total);
page.setRecords(equipmentList); page.setRecords(equipmentList);
......
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