From 0dccaf091729a2a87b2b6803921f6c0bd41809f0 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 08 十一月 2023 12:37:50 +0800 Subject: [PATCH] 代码提交 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java index ddb400b..c87d39e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java @@ -528,7 +528,7 @@ lcStatus = treeQueryObject.getConditionMap().getOrDefault("lcStatus",null); } if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){ - String tableName = this.getTableName(treeQueryObject.getParentOid(),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus")); + String tableName = VciBaseUtil.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),true); doList = codeClassifyMapper .selectCodeClassifyDOByTree( treeQueryObject.getConditionMap().get("id"), @@ -564,28 +564,6 @@ } } return tree; - } - - /** - * 鍒嗙被鍔犺浇鏃惰幏鍙栦笟鍔$被鍨媔d锛屾嫾鎺ヤ笟鍔$被鍨嬭〃鍚� - * @return - */ - private String getTableName(String parentCodeClassifyOid,String id,String lcStatus){ - LambdaQueryWrapper<CodeClassify> wrapper = Wrappers.<CodeClassify>query() - .lambda().select(CodeClassify::getBtmTypeId) - .eq(CodeClassify::getLcStatus, lcStatus) - .isNotNull(CodeClassify::getBtmTypeId) - .last("limit 1"); - if(Func.isNotBlank(id)){ - wrapper.eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid); - }else{ - wrapper.eq(CodeClassify::getParentCodeClassifyOid,parentCodeClassifyOid); - } - CodeClassify codeClassify = codeClassifyMapper.selectOne(wrapper); - if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){ - throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栧埌涓氬姟绫诲瀷ID锛�"); - } - return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true); } /** -- Gitblit v1.9.3