From cdca588a565c7ba3cc22bf45c0701f5f0562783b Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 29 十一月 2023 17:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
index d32f128..6d12941 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java
@@ -160,23 +160,32 @@
public BasicResult selectAppInfo(String regionInspectionId, String userId) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
userId = sysUserInfo.getUserId();
- RegionInspectionEntity obj = regionInspectionRecordMapper.selectInfo(regionInspectionId, userId);
+ String platUserId = regionInspectionRecordMapper.selectPlatUserId(userId);
+ RegionInspectionEntity obj = regionInspectionRecordMapper.selectInfo(regionInspectionId, platUserId);
List<RegionInspectionHazardInformEntity> regionList = new ArrayList<>();
- if (obj.getRegionIds()!=null){
+ if (obj!=null && obj.getRegionIds()!=null){
String[] regionIds = obj.getRegionIds().intern().split(",");
String[] regions = obj.getRegions().intern().split(",");
//区域对象数组
for (int i = 0; i < regionIds.length; i++) {
RegionInspectionRecordEntity recordEntity = regionInspectionRecordMapper.regionInfo(
regionInspectionId,
- userId,
+ platUserId,
regionIds[i]);
+ List<RegionInspectionRecordImgEntity> imgEntityList=null;
+ if (recordEntity!=null){
+ imgEntityList = regionInspectionRecordMapper.selectImgByRecordId(recordEntity.getId());
+ recordEntity.setImgList(imgEntityList);
+ }
RegionInspectionHazardInformEntity regionEntity = RegionInspectionHazardInformEntity
.builder()
.regionInspectionId(obj.getId())
.regionHazardInformId(regionIds[i])
.region(regions[i])
- .recordEntity(recordEntity).build();
+ .recordEntity(recordEntity)
+ .imgList(imgEntityList)
+ .result(recordEntity.getResult())
+ .build();
regionList.add(regionEntity);
}
}
--
Gitblit v1.9.3