From c9fbfd1511cfee19ec017bedd8160739ae5afc98 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期日, 26 十一月 2023 14:05:26 +0800 Subject: [PATCH] 修复关键属性重复,如果是当前分类则返回编码,如果是其他分类则给出提示 --- 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