From 2b04601efc2346606b8fba2d451e8daea8510009 Mon Sep 17 00:00:00 2001
From: Joey <zhouyi01@jiuqi.com.cn>
Date: Wed, 27 Apr 2022 11:15:47 +0800
Subject: [PATCH] fix(@gms/gms-plugin-billexpand): 检查子表不相等公式
- 比较对象的时候比较objectcode
---
develop/@gms/gms-plugin-billexpand/src/formula/CheckUnDuplicateSubField.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/develop/@gms/gms-plugin-billexpand/src/formula/CheckUnDuplicateSubField.js b/develop/@gms/gms-plugin-billexpand/src/formula/CheckUnDuplicateSubField.js
index 8c6f0f4..acc86d4 100644
--- a/develop/@gms/gms-plugin-billexpand/src/formula/CheckUnDuplicateSubField.js
+++ b/develop/@gms/gms-plugin-billexpand/src/formula/CheckUnDuplicateSubField.js
@@ -16,16 +16,18 @@ export default {
let _data1 = dataFun[i].getData()
for (let j = i + 1; j < dataFun.length; j++) {
let _data2 = dataFun[j].getData()
- if (_data1[subFieldCode].value !== _data2[subFieldCode].value) {
- return false;
+ const data1Val = typeof _data1[subFieldCode].value == 'object' ? _data1[subFieldCode].value.objectcode : _data1[subFieldCode].value
+ const data2Val = typeof _data2[subFieldCode].value == 'object' ? _data2[subFieldCode].value.objectcode : _data2[subFieldCode].value
+ if (data1Val !== data2Val) {
+ return false
}
}
}
- return true;
+ return true
} else if (dataFun.length <= 1) {
return true
}else{
- return true;
+ return true
}
},
getResultType:function(){
--
libgit2 0.26.0