From 9cead0735df7fd763f536408f76dec4e5e5bb2c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 12:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 66505ab..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
@@ -2,6 +2,7 @@
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -13,6 +14,7 @@
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
import com.vci.ubcs.code.mapper.CodeClassifyMapper;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
+import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.po.CodeClassifyPO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
@@ -69,6 +71,7 @@
import java.util.stream.Stream;
import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*;
+import static com.vci.ubcs.starter.web.util.VciBaseUtil.getTableName;
@Service
public class CodeClassifyServiceImpl extends ServiceImpl<CodeClassifyMapper, CodeClassify> implements ICodeClassifyService {
@@ -84,6 +87,9 @@
@Resource
private IBtmTypeClient btmTypeClient;
+
+ @Resource
+ private CommonsMapper commonsMapper;
/**
* 鏃ュ織
@@ -442,7 +448,7 @@
List<CodeClassifyVO> voList = new ArrayList<CodeClassifyVO>();
if(!CollectionUtils.isEmpty(codeClassifys)){
for(CodeClassify s: codeClassifys){
- CodeClassifyVO vo = codeClassifyDO2VO(s);
+ CodeClassifyVO vo = codeClassifyDO2VO(s);
if(vo != null){
voList.add(vo);
}
@@ -522,20 +528,21 @@
lcStatus = treeQueryObject.getConditionMap().getOrDefault("lcStatus",null);
}
if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
+ String tableName = VciBaseUtil.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),true);
doList = codeClassifyMapper
- .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
- .equals(
- NacosConfigCache
- .getAdminUserInfo()
- .getTenantId()
- ) ? null:AuthUtil.getTenantId());
+ .selectCodeClassifyDOByTree(
+ treeQueryObject.getConditionMap().get("id"),
+ treeQueryObject.getConditionMap().get("lcStatus"),
+ treeQueryObject.getParentOid(),
+ VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
+ tableName
+ );
}else{
- doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
- .equals(
- NacosConfigCache
- .getAdminUserInfo()
- .getTenantId()
- ) ? null:AuthUtil.getTenantId());
+ // 鍙鍓嶇浼氫紶鍙傛暟杩囨潵灏变笉浼氬嚭鐜拌蛋杩欏彞鐨勬儏鍐碉紝鎵�浠ユ煡璇㈡�绘暟娌″湪杩欏効娣诲姞
+ doList =codeClassifyMapper.selectCodeClassifyVOByTree(
+ treeQueryObject.getParentOid(),
+ VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId()
+ );
}
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
@@ -545,6 +552,7 @@
return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
});
+
Iterator var6 = tree.listIterator();
while(var6.hasNext()){
Tree trees = (Tree) var6.next();
@@ -1234,7 +1242,7 @@
return null;
}
List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
- if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
+ if(Objects.equals(tree.getAttributes().get("btmTypeId"), btmType.getId())){
tree.getAttributes().put("btmTypeOid",btmType.getOid());
return true;
}
--
Gitblit v1.9.3