浏览代码

Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tags/v1.0.0^2
chengwang 1年前
父节点
当前提交
21e5a9bb75
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. +1
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListByWorkOrderIdService.java

+ 1
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListByWorkOrderIdService.java 查看文件

@@ -142,7 +142,6 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
InspectionFileHandleVo inspectionFileHandleVo;
User user;
QuestionType questionType;
String handlerImages = "";
InspectionFileHandle inspectionFileHandle;
for (InspectionFile inspectionFile : inspectionFileList) {
inspectionFileHandleVo = new InspectionFileHandleVo();
@@ -159,10 +158,10 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
inspectionFileHandleVo.setQuestionCode(questionType.getCode());
inspectionFileHandleVo.setQuestionName(questionType.getContent());
}

if (ObjectUtil.isNotNull(inspectionFileHandleMap)) {
inspectionFileHandle = inspectionFileHandleMap.get(inspectionFile.getId());
if (null != inspectionFileHandle) {
String handlerImages = "";
if (ObjectUtil.isNotNull(inspectionFileHandleUserMap)) {
user = inspectionFileHandleUserMap.get(inspectionFileHandle.getHandlerUser());
if (null != user) {

正在加载...
取消
保存