From 08e85d26f1a995ac13de724ddc683fa241b5ccc2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 16:53:36 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..da36d7e 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
@@ -143,11 +143,11 @@
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
- String tenantId = AuthUtil.getTenantId().toString();
+ //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