From a28075c184ffb2e9853233b7b66e3697e6b3f0b6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 29 八月 2023 21:53:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
index b623e12..bb3b32b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
@@ -145,9 +145,9 @@
}
String tenantId = AuthUtil.getTenantId().toString();
Map<String, String> conditionMap = baseQueryObject.getConditionMap();
- if(Func.isNotEmpty(tenantId)){
+ /*if(Func.isNotEmpty(tenantId)){
conditionMap.put("TENANT_ID",tenantId);
- }
+ }*/
return CodeClstempattrService.gridCodeClassifyTemplateAttr(conditionMap,baseQueryObject.getPageHelper());
}
--
Gitblit v1.9.3