修改驾驶舱查询工厂优化

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

@@ -398,8 +398,8 @@ public class ServiceHGSC007 extends ServiceEPBase {
 			});
 			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(
+					.map(item -> new Factory(item.getCompanyCode(), item.getCompanyName(), item.getOrgId(),
+							item.getOrgCname())).collect(Collectors.collectingAndThen(
 							Collectors.toMap(Factory::getFactoryCode, Function.identity(),
 									(oldValue, newValue) -> oldValue),
 							// 将Map转回List

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

@@ -1067,7 +1067,7 @@
 				</isNotEmpty>
 			group by h2.process_code
 		) B on A.process_code = B.process_code
-		where 1=1
+		where 1=1 and DELETE_FLAG = '0'
 			<isNotEmpty prepend=" AND " property="accountCode">
 				A.account_code = #accountCode#
 			</isNotEmpty>
@@ -1099,7 +1099,7 @@
 			</isNotEmpty>
 			group by h2.process_code
 		) B on A.process_code = B.process_code
-		where 1=1
+		where 1=1 and DELETE_FLAG = '0'
 			<isNotEmpty prepend=" AND " property="accountCode">
 				A.account_code = #accountCode#
 			</isNotEmpty>