From b28da4c353e50fc2491c733889fef5f79e5926f2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 16:19:00 +0800
Subject: [PATCH] 关于集成配置需求更改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 192f270..6b46856 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -665,7 +665,11 @@
             }
             final String[] sql = {"select count(*) from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
             conditionMap.forEach((key, value) -> {
-                sql[0] += " and " + key + " = " + value;
+				if(StringUtils.isBlank(value)||value.equals(QueryOptionConstant.ISNULL)) {
+					sql[0] += " and " + key + " is null";
+				}else{
+					sql[0] += " and " + key + " = " + value;
+				}
             });
             if (StringUtils.isNotBlank(orderDTO.getOid())) {
                 //淇敼鐨勬椂鍊欙紝闇�瑕佹帓闄よ嚜宸�
@@ -686,8 +690,6 @@
 	/**
 	 * 鏍¢獙鍏抽敭灞炴��
 	 *
-	 * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
-	 * @param templateVO       妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
 	 * @param orderDTO         缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
 	 */
 	public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) {

--
Gitblit v1.9.3