From 2e55c32ab671ce5e4a5d1c713fac74ae0b2724e6 Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期二, 10 十月 2023 18:37:18 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yx
---
_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
index 671fe30..712b51b 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
@@ -2,7 +2,8 @@
#parent: #root
Method MappingUnitData (
Strings businesstypes,
- GlobalOTDTable globalOTDTable
+ GlobalOTDTable globalOTDTable,
+ Strings organcodelist
)
{
Description: 'Get unit data from operation mapping'
@@ -15,7 +16,6 @@
if( isnull( businesstypes ) or businesstypes.Size() = 0 ) {
listtodeal := selectset( globalOTDTable, Global_MappingOperation, item, true );
} else {
- organcodelist := selectvalues( globalOTDTable, BusinessType.OrganCode, organ, businesstypes.Find( organ.BusinessType().BusinessTypeName() ) <> -1, organ.OrganCodeName() );
listtodeal := selectset( globalOTDTable, Global_MappingOperation, item,
// businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
( businesstypes.Find( item.BusinessType() ) >= 0 ) and
--
Gitblit v1.9.3