From cb4e11b19446843188cf628ac8f6be5fe1fa68c7 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 06 六月 2023 18:01:52 +0800
Subject: [PATCH] 配置
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 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 31ea7b7..24ae819 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
@@ -19,14 +19,11 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-<<<<<<< Updated upstream
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
-=======
import com.vci.ubcs.omd.feign.IBtmTypeClient;
->>>>>>> Stashed changes
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -41,7 +38,6 @@
import com.vci.ubcs.starter.util.LocalFileUtil;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
@@ -57,7 +53,6 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -81,19 +76,7 @@
private ICodeRuleService codeRuleService;
@Resource
-<<<<<<< Updated upstream
private IBtmTypeClient btmTypeClient;
-=======
- private CodeOsbtmtypeMapper codeOsbtmtypeMapper;
-
- @Resource
- private CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;
-
- @Resource
- private IBtmTypeClient btmTypeClient;
-
-
->>>>>>> Stashed changes
/**
* 鏃ュ織
@@ -1048,7 +1031,15 @@
/**
<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
* 涓婚搴撶殑鏍�,宸茶仈璋冧笟鍔＄被鍨嬫煡璇eign
+=======
+ * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
+>>>>>>> Stashed changes
+=======
+ * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
+>>>>>>> Stashed changes
=======
* 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
>>>>>>> Stashed changes
@@ -1073,7 +1064,6 @@
if(Func.isEmpty(btmTypeVOS) || Func.isEmpty(trees)){
return null;
}
-<<<<<<< Updated upstream
List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
tree.getAttributes().put("btmTypeOid",btmType.getOid());
@@ -1082,10 +1072,6 @@
return false;
}).collect(Collectors.toList())))
.collect(Collectors.toList());
-=======
- List<Tree> treeList = trees.stream().filter(tree -> btmTypeVOS.stream().
- anyMatch(btmType -> Objects.equals(tree.getAttributes().get("id"), btmType.getId()))).collect(Collectors.toList());
->>>>>>> Stashed changes
return treeList;
}
--
Gitblit v1.9.3