修改并行stream引起数据丢失问题（list.add非原子操作）

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1403,7 +1403,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         Map<Long, CheckObjectDto> map = new HashMap<>(companyList.size());
         companyList.forEach(e -> map.put(e.getSequenceNbr(), e));
         Set<? extends Map.Entry<Long, ? extends CheckObjectDto>> entries = map.entrySet();
-        entries.parallelStream().forEach(entry -> {
+        entries.stream().forEach(entry -> {
             CheckObjectDto value = entry.getValue();
             if (!ObjectUtils.isEmpty(value)) {
                 Long parent = ObjectUtils.isEmpty(value.getParentId()) ? 0L : Long.parseLong(value.getParentId());
@@ -1412,7 +1412,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                     int num = orgUsrTreeDto.getNum() + value.getNum();
                     orgUsrTreeDto.setNum(num);
                 } else {
-                    if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey())) {
+                    if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && null == value.getParentId()) {
                         list.add(value);
                     }
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1938,7 +1938,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 }
             } catch (Exception e) {
             }
-            Map<String, Object> finalBuildingAbsolutePositionMap = buildingAbsolutePositionMap;
+            Map<String, Object> finalBuildingAbsolutePositionMap =
+                    ValidationUtil.isEmpty(buildingAbsolutePositionMap) ? new HashMap<>() : buildingAbsolutePositionMap;
             iPage.getRecords().forEach(danger -> {
                 if (!ValidationUtil.isEmpty(danger.getStructureId()) && !ValidationUtil.isEmpty(finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()))) {
                     danger.setStructureName(finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()).toString());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -1270,7 +1270,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
                 latentDangerBo.setReformLimitDate(DateUtil.str2Date(executeParam.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
                 latentDangerBo.setDangerLevel(executeParam.getDangerLevel().toString());
-                JSONObject reformJsonObject = JSONObject.parseObject(latentDangerBo.getReformJson());
+//                JSONObject reformJsonObject = JSONObject.parseObject(latentDangerBo.getReformJson());
+                JSONObject reformJsonObject = executeParam.getFlowJson();
                 if (ValidationUtil.isEmpty(reformJsonObject)) {
                     reformJsonObject = new JSONObject();
                 }