Commit 86fe61ed authored by 胡秀武's avatar 胡秀武

胡秀武:模型列表基础信息属性信息bug修复

parent 8a336758
...@@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements ...@@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) {
QueryWrapper<Model> queryWrapper = new QueryWrapper<>(); QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("model_group_code", modelCode) queryWrapper.eq("model_group_code", modelCode)
.like(StringUtils.isNotEmpty(searchCondition), "ocp_model_prop", searchCondition) .like(StringUtils.isNotEmpty(searchCondition), "model_name", searchCondition)
.orderByDesc("model_ctime"); .orderByDesc("model_ctime");
List<Model> modelList = modelMapper.selectList(queryWrapper); List<Model> modelList = modelMapper.selectList(queryWrapper);
PageUtil<Model> pageUtil = new PageUtil<>(); PageUtil<Model> pageUtil = new PageUtil<>();
...@@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements ...@@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
modelWrapper.eq("model_code",modelCode); modelWrapper.eq("model_code",modelCode);
List<Model> modelList = modelMapper.selectList(modelWrapper); List<Model> modelList = modelMapper.selectList(modelWrapper);
proWrapper.eq("model_code", modelCode) proWrapper.eq("model_code", modelCode)
.like(StringUtils.isNotEmpty(searchCondition), "column_name", searchCondition) .like(StringUtils.isNotEmpty(searchCondition), "column_comments", searchCondition)
.orderByDesc("prop_ctime"); .orderByDesc("prop_ctime");
List<ModelProperty> modelPropertiesList = modelPropertyMapper.selectList(proWrapper); List<ModelProperty> modelPropertiesList = modelPropertyMapper.selectList(proWrapper);
modelPropertiesList.forEach(pro -> modelPropertiesList.forEach(pro ->
pro.setModelTable(modelList.get(0) == null ?"":modelList.get(0).getModelTable()) pro.setModelTable(modelList.get(0) == null ? "":modelList.get(0).getModelTable())
); );
PageUtil<ModelProperty> pageUtil = new PageUtil<>(); PageUtil<ModelProperty> pageUtil = new PageUtil<>();
pageUtil.startPage(currentPage, pageSize, modelPropertiesList); pageUtil.startPage(currentPage, pageSize, modelPropertiesList);
......
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