From 9e9435a15d12e364d0a910434de0568e11bb273c Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期四, 03 八月 2023 17:08:05 +0800 Subject: [PATCH] 1、处理lastr","firstr","lastv","firstv"字段在数据创建时为整形问题。 2、处理属性分组设置了一个属性,且配置表单中不显示。那么页面的表单应该不显示此分组。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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 f894dd4..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 @@ -34,6 +34,8 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.util.CollectionUtils; @@ -42,6 +44,7 @@ import javax.validation.Valid; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 缂栫爜搴撳畾涔�-妯℃澘灞炴�� 鎺у埗鍣� @@ -140,7 +143,12 @@ if(baseQueryObject == null){ baseQueryObject = new BaseQueryObject(); } - return CodeClstempattrService.gridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper()); + String tenantId = AuthUtil.getTenantId().toString(); + Map<String, String> conditionMap = baseQueryObject.getConditionMap(); + /*if(Func.isNotEmpty(tenantId)){ + conditionMap.put("TENANT_ID",tenantId); + }*/ + return CodeClstempattrService.gridCodeClassifyTemplateAttr(conditionMap,baseQueryObject.getPageHelper()); } /** -- Gitblit v1.9.3