Commit 444d3cee authored by wujipeng's avatar wujipeng
Browse files

优化

parent 033c4d21
...@@ -102,7 +102,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -102,7 +102,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
} else if ("功能性".equals(defectEntity.getType())) { } else if ("功能性".equals(defectEntity.getType())) {
functionalDefect++; functionalDefect++;
} }
if (StrUtil.isNotEmpty(roadDTO.getDefectType()) && roadDTO.getDefectType().equals(defectEntity.getType())) { if (StrUtil.isEmpty(roadDTO.getDefectType()) || roadDTO.getDefectType().equals(defectEntity.getType())) {
RoadVO roadVO = new RoadVO(); RoadVO roadVO = new RoadVO();
roadVO.setDefectType(defectEntity.getType()); roadVO.setDefectType(defectEntity.getType());
roadVO.setDefectName(defectEntity.getName()); roadVO.setDefectName(defectEntity.getName());
...@@ -119,7 +119,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -119,7 +119,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
} else if ("功能性".equals(repairEntity.getType())) { } else if ("功能性".equals(repairEntity.getType())) {
functionalDefect++; functionalDefect++;
} }
if (StrUtil.isNotEmpty(roadDTO.getDefectType()) && roadDTO.getDefectType().equals(repairEntity.getType())) { if (StrUtil.isEmpty(roadDTO.getDefectType()) || roadDTO.getDefectType().equals(repairEntity.getType())) {
RoadVO roadVO = new RoadVO(); RoadVO roadVO = new RoadVO();
roadVO.setDefectType(repairEntity.getType()); roadVO.setDefectType(repairEntity.getType());
roadVO.setDefectName(repairEntity.getName()); roadVO.setDefectName(repairEntity.getName());
......
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