diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java index 409bfa48aba2c414affd15c70d1928df2c0af78c..5f2d6e245ccf3df1ad1fee1e4d65bc9e480f66b7 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl implements private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("model_group_code", modelCode) - .like(StringUtils.isNotEmpty(searchCondition), "ocp_model_prop", searchCondition) + .like(StringUtils.isNotEmpty(searchCondition), "model_name", searchCondition) .orderByDesc("model_ctime"); List modelList = modelMapper.selectList(queryWrapper); PageUtil pageUtil = new PageUtil<>(); @@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl implements modelWrapper.eq("model_code",modelCode); List modelList = modelMapper.selectList(modelWrapper); proWrapper.eq("model_code", modelCode) - .like(StringUtils.isNotEmpty(searchCondition), "column_name", searchCondition) + .like(StringUtils.isNotEmpty(searchCondition), "column_comments", searchCondition) .orderByDesc("prop_ctime"); List modelPropertiesList = modelPropertyMapper.selectList(proWrapper); modelPropertiesList.forEach(pro -> - pro.setModelTable(modelList.get(0) == null ?"":modelList.get(0).getModelTable()) + pro.setModelTable(modelList.get(0) == null ? "":modelList.get(0).getModelTable()) ); PageUtil pageUtil = new PageUtil<>(); pageUtil.startPage(currentPage, pageSize, modelPropertiesList);