2024-10-19 生产驾驶舱接口调整

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java

@@ -370,21 +370,21 @@ public class ServiceHGSC007 extends ServiceEPBase {
 			Optional.ofNullable(roleCompanyCode).orElse(new ArrayList<>()).stream().forEach(code -> {
 				factoryCodes.addAll(HGXSTools.XsOrg.queryByParent(code, OrgTypeEnum.FACTORY.getCode()));
 			});
-			//List<Map<String,Object>> mapList = getOrg();
-			//factoryCodes.addAll(mapList);
+			List list = factoryCodes.stream()
+					.filter(o -> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(), OrgTypeEnum.FACTORY.getCode()))
+					.map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getFactoryCode(),
+							item.getFactoryName())).collect(Collectors.collectingAndThen(
+							Collectors.toMap(Factory::getFactoryCode, Function.identity(),
+									(oldValue, newValue) -> oldValue),
+							// 将Map转回List
+							m -> new ArrayList<>(m.values())
+					));
+			inInfo.set(EiConstant.resultBlock, list);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "APP查询工厂失败");
 		}
-		List list = factoryCodes.stream()
-				.filter(o -> com.baosight.hggp.util.StringUtils.equals(o.getOrgType(), OrgTypeEnum.FACTORY.getCode()))
-				.map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getFactoryCode(),
-						item.getFactoryName())).collect(Collectors.collectingAndThen(
-						Collectors.toMap(Factory::getFactoryCode, Function.identity(),
-								(oldValue, newValue) -> oldValue),
-						// 将Map转回List
-						m -> new ArrayList<>(m.values())
-				));
-		inInfo.set(EiConstant.resultBlock, list);
+
 		return inInfo;
 	}
 }
+