Просмотр исходного кода

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

pull/380/head
wanjing 9 месяцев назад
Родитель
Сommit
a7c2b1752c
2 измененных файлов: 2 добавлений и 1 удалений
  1. +1
    -1
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java
  2. +1
    -0
      tuoheng-service/tuoheng-miniprogram/src/main/resources/logback.xml

+ 1
- 1
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java Просмотреть файл

for (InspectionInfoVo inspectionInfoVo : inspectionInfoVoList) { for (InspectionInfoVo inspectionInfoVo : inspectionInfoVoList) {
//航线名称 //航线名称
if (CollectionUtil.isNotEmpty(airportLineMap)) { if (CollectionUtil.isNotEmpty(airportLineMap)) {
if (ObjectUtil.isNotNull(airportLineMap.get(inspectionInfoVo.getInspectionLine()))) {
if (ObjectUtil.isNotEmpty(airportLineMap.get(inspectionInfoVo.getInspectionLine()))) {
inspectionInfoVo.setInspectionLineName(airportLineMap.get(inspectionInfoVo.getInspectionLine()).getFileName()); inspectionInfoVo.setInspectionLineName(airportLineMap.get(inspectionInfoVo.getInspectionLine()).getFileName());
} }
} }

+ 1
- 0
tuoheng-service/tuoheng-miniprogram/src/main/resources/logback.xml Просмотреть файл

</appender> </appender>


<logger name="com.tuoheng" level="DEBUG" additivity="false"> <logger name="com.tuoheng" level="DEBUG" additivity="false">
<appender-ref ref="console" />
<appender-ref ref="file.async" /> <appender-ref ref="file.async" />
</logger> </logger>
<!--log4jdbc --> <!--log4jdbc -->

Загрузка…
Отмена
Сохранить