From 93db5b42a725ded6bd1cc41981804bc8649c03ba Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 三月 2024 15:30:13 +0800
Subject: [PATCH] func vaildate添加说明注释

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java |  275 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 232 insertions(+), 43 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 c41aada..c880d23 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
@@ -4,21 +4,22 @@
 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.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.entity.CodeClassifyTemplate;
+import com.vci.ubcs.code.entity.*;
 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.mapper.*;
 import com.vci.ubcs.code.po.CodeClassifyPO;
 import com.vci.ubcs.code.service.ICodeClassifyService;
 import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
 import com.vci.ubcs.code.service.ICodeRuleService;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
@@ -48,6 +49,7 @@
 import com.vci.ubcs.starter.web.util.LangBaseUtil;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.system.cache.NacosConfigCache;
+import com.vci.ubcs.system.feign.ISysClient;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,13 +62,16 @@
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.awt.event.ItemEvent;
 import java.io.File;
 import java.util.*;
+import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -89,7 +94,7 @@
 	private IBtmTypeClient btmTypeClient;
 
 	@Resource
-	private CommonsMapper commonsMapper;
+	private ISysClient sysClient;
 
 	/**
 	 * 鏃ュ織
@@ -103,10 +108,21 @@
 
 	@Resource
 	private ICodeKeyAttrRepeatService iCodeKeyattrrepeatService;
+
+	@Resource
+	private CodeAllCodeMapper codeAllCodeMapper;
+
+	@Resource
+	private CodeSerialValueMapper codeSerialValueMapper;
+
+	@Resource
+	private CodeBasicSecMapper codeBasicSecMapper;
+
 	/**
 	 * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
 	 */
 	public static  final String PARENT_FIELD_NAME = "parentCodeClassifyOid";
+
 	/**
 	 * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
 	 * @param wrapper 鏌ヨ灏佽鍣�
@@ -179,6 +195,7 @@
 	 * @return 鎵ц缁撴灉
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public R editSave(CodeClassify codeClassifyEntity) {
 		if(codeClassifyEntity == null || codeClassifyEntity.getOid() == null){
 			return R.fail("浼犲叆鏁版嵁涓嶈兘涓虹┖锛�");
@@ -196,15 +213,32 @@
 		codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
 		codeClassifyEntity.setLastModifyTime(new Date());
 		codeClassifyEntity.setTs(new Date());
-		int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
+		int updateEntity = codeClassifyMapper.updateById(codeClassifyEntity);
+		// 濡傛灉涓嶆槸鍙跺瓙缁撶偣锛屽垯闇�瑕佷慨鏀瑰叾涓嬫墍鏈夌殑瀛愬垎绫伙紝鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岀殑鍊�
+		String oid = codeClassifyEntity.getOid();
+		List<CodeClassify> codeClassifies = codeClassifyMapper.selectStartWithCurrentOid(oid);
+		int updateAttr = 0;
+		// 涓嶄负绌哄氨闇�瑕佽褰撳墠鍒嗙被涓嬫墍鏈夊瓙鍒嗙被鐨刬sParticipateCheck
+		if(!codeClassifies.isEmpty()){
+			List<String> oids = codeClassifies.stream().map(CodeClassify::getOid).collect(Collectors.toList());
+			LambdaUpdateWrapper<CodeClassify> updateWrapper = Wrappers.<CodeClassify>update()
+				.lambda().in(CodeClassify::getOid, oids)
+				.set(CodeClassify::getIsParticipateCheck, codeClassifyEntity.getIsParticipateCheck());
+			// 鐖跺垎绫荤殑涓氬姟绫诲瀷鍋氫簡鏇存敼锛屾墍鏈夊瓙鍒嗙被鐨勯兘寰楄繘琛屾洿鏀�
+			if(!codeClassifyEntity.getBtmTypeId().equals(detail.getBtmTypeId())){
+				updateWrapper.set(CodeClassify::getBtmTypeId,codeClassifyEntity.getBtmTypeId())
+					.set(CodeClassify::getBtmTypeName,codeClassifyEntity.getBtmTypeName());
+			}
+			updateAttr = codeClassifyMapper.update(null,updateWrapper);
+
+		}
 
 //         //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
 //         if(FRAMEWORK_DATA_ENABLED.equals(codeClassifyDO.getLcStatus()));
 //         {
 //             codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_EDIT,FRAMEWORK_DATA_ENABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO.getOid(), codeClassifyDTO.getTs());
 //         }
-		return R.status(SqlHelper.retBool(insertNumber));
-//		return BaseResult.success(codeClassifyDO2VO(codeClassifyDO));
+		return R.status(SqlHelper.retBool(updateAttr) & SqlHelper.retBool(updateEntity));
 	}
 
 	/**
@@ -479,7 +513,7 @@
 	 * @return 涓婚搴撳垎绫绘樉绀烘爲
 	 */
 	@Override
-	public List<Tree> referTree(TreeQueryObject treeQueryObject) {
+	public List<Tree> referTree(TreeQueryObject treeQueryObject) throws ServiceException{
 		if(treeQueryObject == null){
 			treeQueryObject = new TreeQueryObject();
 		}
@@ -489,7 +523,7 @@
 		if(treeQueryObject.getConditionMap().containsKey(LC_STATUS)) {
 			treeQueryObject.getConditionMap().remove(LC_STATUS);
 		}
-		if(treeQueryObject.getExtandParamsMap() ==null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) {
+		if(treeQueryObject.getExtandParamsMap() == null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) {
 		}
 		treeQueryObject.getConditionMap().put(LC_STATUS, FRAMEWORK_DATA_ENABLED);
 		return treeCodeClassify(treeQueryObject);
@@ -519,7 +553,7 @@
 	 * @return 涓婚搴撳垎绫� 鏄剧ず鏍�
 	 */
 	@Override
-	public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) {
+	public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) throws ServiceException{
 		List<CodeClassify> doList = null;
 		String id = null;
 		String lcStatus = null;
@@ -528,14 +562,15 @@
 			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 = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
+			// TODO: 2024-1-24 23:25鎴戝幓鎺変簡鎳掑姞杞斤紝鍥犱负浼氬奖鍝嶆暟鎹巿鏉冭繃婊ゅ拰鍒嗙被鎼滅储鍔熻兘锛岃�屼笖杩欏効鎰熻娌″繀瑕佸仛鎳掑姞杞�
 			doList = codeClassifyMapper
 				.selectCodeClassifyDOByTree(
 					treeQueryObject.getConditionMap().get("id"),
 					treeQueryObject.getConditionMap().get("lcStatus"),
 					treeQueryObject.getParentOid(),
-					VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
-					tableName
+					VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId()
+					/*tableName*/
 				);
 		}else{
 			// 鍙鍓嶇浼氫紶鍙傛暟杩囨潵灏变笉浼氬嚭鐜拌蛋杩欏彞鐨勬儏鍐碉紝鎵�浠ユ煡璇㈡�绘暟娌″湪杩欏効娣诲姞
@@ -547,43 +582,91 @@
 		List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
 		TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
 		treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
-		List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
+		List<Tree> tree = revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
 			//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
 			return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
 				.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
 		});
+		// 闈炶秴绠¤繃婊ゆ湭鎺堟潈鐨勫垎绫�
+		if(!VciBaseUtil.checkAdminTenant()){
+			// 閭ｄ簺鍒嗙被鍏峰鏌ョ湅鏉冮檺
+			R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(
+				Arrays.asList(AuthUtil.getUser().getRoleId().split(",")),
+				treeQueryObject.getConditionMap().getOrDefault("authType","classify_auth"),
+				treeQueryObject.getConditionMap().getOrDefault("buttonCode","classify_view"),
+				treeQueryObject.getConditionMap().getOrDefault("menuCode","classifyTree")
+			);
+			// 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭d闆嗗悎涓虹┖
+			if(!viewClassByRoleIds.isSuccess() && viewClassByRoleIds.getData().isEmpty()){
+				throw new ServiceException("涓绘暟鎹煡鐪嬫潈闄愭湭閰嶇疆锛屾垨閰嶇疆鏈夎锛�");
+			}
+			// 杩囨护
+			filterTreeNodes(tree,viewClassByRoleIds.getData());
+		}
+		// 鍔犺浇鍒嗙被鏄惁鍏锋湁瀛愬垎绫�
+		tree.parallelStream().forEach(item -> {
+			boolean checkHasChild = checkHasChild(item.getOid());
+			item.setLeaf(!checkHasChild);
+		});
+		return tree;
+	}
 
-		Iterator var6 =  tree.listIterator();
-		while(var6.hasNext()){
-			Tree trees = (Tree) var6.next();
-			boolean checkHasChild=codeClassifyMapper.checkHasChild(trees.getOid());
-			if(checkHasChild){
-				trees.setLeaf(false);
-			}else{
-				trees.setLeaf(true);
+	/**
+	 * 鍒嗙被鎺堟潈杩囨护鎺夋病鏈夋潈闄愮殑鍒嗙被
+	 * @param trees
+	 * @param classifyIds
+	 */
+	private void filterTreeNodes(List<Tree> trees, List<String> classifyIds) {
+		Iterator<Tree> iterator = trees.iterator();
+		while (iterator.hasNext()) {
+			Tree tree = iterator.next();
+			/*Boolean checkHasChild = checkHasChild(tree.getOid());
+			tree.setLeaf(!checkHasChild);*/
+			if (classifyIds.contains(tree.getOid())) {
+				// 濡傛灉椤跺眰鑺傜偣瀛樺湪 classifyIds 锛岀洿鎺ヤ繚鐣欏叾瀛愯妭鐐归泦鍚�
+				continue;
+			}
+			if (tree.getChildren() != null && !tree.getChildren().isEmpty()) {
+				filterTreeNodes(tree.getChildren(), classifyIds);
+			}
+			if (!hasMatchingChild(tree, classifyIds)) {
+				iterator.remove();
 			}
 		}
-		return tree;
+	}
+
+	private boolean hasMatchingChild(Tree tree, List<String> classifyIds) {
+		if (classifyIds.contains(tree.getOid())) {
+			return true;
+		}
+		if (tree.getChildren() != null) {
+			for (Tree child : tree.getChildren()) {
+				if (hasMatchingChild(child, classifyIds)) {
+					return true;
+				}
+			}
+		}
+		return false;
 	}
 
 	/**
 	 * 鍒嗙被鍔犺浇鏃惰幏鍙栦笟鍔＄被鍨媔d锛屾嫾鎺ヤ笟鍔＄被鍨嬭〃鍚�
 	 * @return
 	 */
-	private String getTableName(String parentCodeClassifyOid,String id,String lcStatus){
+	private String getTableName(String btmTypeId,String id,String lcStatus){
+		if(Func.isNotEmpty(btmTypeId)){
+			return VciBaseUtil.getTableName(btmTypeId,true);
+		}
 		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);
-		}
+			.last("limit 1")
+			.eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);
+
 		CodeClassify codeClassify = codeClassifyMapper.selectOne(wrapper);
 		if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
-			throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栦笟鍔＄被鍨婭D锛�");
+			throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栧埌涓氬姟绫诲瀷ID锛�");
 		}
 		return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
 	}
@@ -639,12 +722,106 @@
 	 * @param oid
 	 * @return
 	 */
-	public List<CodeClassifyVO> selectAllClassifyByOid(String oid){
-		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId());
+	public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
+		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,fieldInPath,AuthUtil.getTenantId());
 		List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
 		return voList;
 
 	}
+
+	/**
+	 * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍￠獙鐨勫垎绫籵id
+	 * @param topOid
+	 * @param currentOid
+	 * @return
+	 */
+	@Override
+	public String selectLeafByParentClassifyOid(String topOid, String currentOid) {
+		List<CodeClassify> codeClassifies = codeClassifyMapper.selectLeafByParentClassifyOid(topOid, currentOid);
+		if(codeClassifies.isEmpty()){
+			return "";
+		}
+		String oids = codeClassifies.stream()
+			.map(CodeClassify::getOid)
+			.map(s -> "'" + s + "'")
+			.collect(Collectors.joining(","));;
+		return oids;
+	}
+
+	/**
+	 *  鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夊彾瀛愯妭鐐瑰垎绫籵id
+	 * @param pid
+	 * @return
+	 */
+	@Override
+	public String selectLeafByPid(String pid) {
+		List<CodeClassify> codeClassifies = codeClassifyMapper.selectLeafByPid(pid);
+		if(codeClassifies.isEmpty()){
+			return "";
+		}
+		String oids = codeClassifies.stream()
+			.map(CodeClassify::getOid)
+			.map(s ->s)
+			.collect(Collectors.joining(","));;
+		return oids;
+	}
+
+	/**
+	 * 娴佹按渚濊禆鐢熸垚
+	 */
+	@Override
+	public R flowingDependencyGen(String classifyOid) {
+		//鏌ヨ姝ゅ垎绫讳笅闈㈢殑鎵�鏈夊垎绫�
+		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(classifyOid,AuthUtil.getTenantId(),null);
+		//鏌ヨ鐮佸�艰〃锛岃幏鍙栨渶澶ф祦姘�
+		List<CodeAllCode> codeAllCodeVOS = codeAllCodeMapper.selectGroupByClassify("'" + codeClassifyList.stream()
+			.map(classfiy -> classfiy.getOid()).collect(Collectors.joining("','")) + "'","'${sav}'");
+		//寰�娴佹按琛ㄩ噷闈㈠姞鏁版嵁锛屾湁鍒欐洿鏂帮紝鏃犲垯娣诲姞鏁版嵁銆�
+		for (CodeAllCode codeAllCodeVO : codeAllCodeVOS) {
+			if(Func.isEmpty(codeAllCodeVO.getSerialUnit())){
+				throw new ServiceException("缂栫爜涓猴細" + codeAllCodeVO.getId() + "鐨勭爜鍊兼暟鎹祦姘翠緷璧栦笉鑳戒负绌猴紒");
+			}
+			try {
+				CodeRuleVO codeRuleVO = codeRuleService.getObjectByOid(codeAllCodeVO.getCodeRuleOid());
+				if(Func.isEmpty(codeRuleVO)){
+					continue;
+				}
+			}catch (Exception e){
+				continue;
+			}
+			QueryWrapper<CodeBasicSec> secWrapper = new QueryWrapper<>();
+			secWrapper.eq("PKCODERULE",codeAllCodeVO.getCodeRuleOid());
+			secWrapper.eq("SECTYPE","codeserialsec");
+			List<CodeBasicSec> codeBasicSecs = codeBasicSecMapper.selectList(secWrapper);
+			if(codeBasicSecs.size() == 0 ){
+				throw new ServiceException("鏍规嵁鐮佸�糏D锛�" + codeAllCodeVO.getCodeRuleOid() + ",鐮佹绫诲瀷涓烘祦姘寸爜娈�(codeserialsec),鍦ㄥ熀纭�鐮佹涓湭鎵惧埌鐩稿叧鏁版嵁锛�");
+			}
+			QueryWrapper<CodeSerialValue> wrapper = new QueryWrapper<>();
+			wrapper.eq("codeRuleOid",codeAllCodeVO.getCodeRuleOid());
+			wrapper.eq("serialUnit",codeAllCodeVO.getSerialUnit());
+			wrapper.eq("codeSecOid",codeBasicSecs.get(0).getOid());
+			List<CodeSerialValue> codeSerialValues = codeSerialValueMapper.selectList(wrapper);
+			if(codeSerialValues.size() == 0){
+				CodeSerialValue newSerialValue = new CodeSerialValue();
+				DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue");
+				newSerialValue.setCodeRuleOid(codeAllCodeVO.getCodeRuleOid());
+				newSerialValue.setCodeSecOid(codeBasicSecs.get(0).getOid());
+				newSerialValue.setSerialUnit(codeAllCodeVO.getSerialUnit());
+				newSerialValue.setMaxSerial(codeAllCodeVO.getUnFillSerial());
+				newSerialValue.setLctid("defaultLC");
+				newSerialValue.setLcStatus("Exist");
+				codeSerialValueMapper.insert(newSerialValue);
+			}else{
+				codeSerialValues.get(0).setMaxSerial(codeAllCodeVO.getUnFillSerial());
+				codeSerialValues.get(0).setLastModifyTime(new Date());
+				codeSerialValues.get(0).setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+				codeSerialValues.get(0).setTs(new Date());
+				codeSerialValueMapper.updateById(codeSerialValues.get(0));
+			}
+		}
+		return R.success("鎿嶄綔鎴愬姛锛�");
+	}
+
 	/***
 	 * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
 	 * @param desc
@@ -807,9 +984,8 @@
 	@Override
 	public List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable) {
 		if(allLevel){
-			List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath);
+			List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath,AuthUtil.getTenantId());
 			if(!CollectionUtils.isEmpty(classifyDOS)){
-				// 杩欏効鐢╯tream鏈夌偣鎱�
 				classifyDOS = classifyDOS.parallelStream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
 			}
 			return codeClassifyDO2VOs(classifyDOS);
@@ -928,7 +1104,7 @@
 		Map<String/**璺緞**/,String/**涓婚敭**/> oidPathMap = new HashMap<>();
 
 		//鎴戜滑闇�瑕佹煡璇㈡墍鏈夊凡缁忓瓨鍦ㄧ殑鍒嗙被锛屼富瑕佹槸璺緞锛岀敤鏉ュ垽鏂垎绫荤殑鏁版嵁
-		List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null);
+		List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null,AuthUtil.getTenantId());
 		Map<String/**璺緞**/, CodeClassify/**宸茬粡瀛樺湪鐨勬暟鎹�**/> pathDOMap = Optional.ofNullable(existClassifyDOs).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> {
 			String path = s.getPath();
 			if(StringUtils.isNotBlank(path) && path.startsWith("#")){
@@ -1301,11 +1477,11 @@
 		if(!CollectionUtils.isEmpty(dataList)){
 			for(Map data:dataList){
 				CodeClassify codeClassifyDO = new CodeClassify();
-				codeClassifyDO.setOid(VciBaseUtil.getStringValueFromObject(data.get("OID")));
-				codeClassifyDO.setId(VciBaseUtil.getStringValueFromObject(data.get("ID")));
-				codeClassifyDO.setName(VciBaseUtil.getStringValueFromObject(data.get("NAME")));
-				codeClassifyDO.setBtmTypeId(VciBaseUtil.getStringValueFromObject(data.get("BTMTYPEID")));
-				codeClassifyDO.setBtmTypeName(VciBaseUtil.getStringValueFromObject(data.get("BTMTYPENAME")));
+				codeClassifyDO.setOid(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"OID")));
+				codeClassifyDO.setId(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"ID")));
+				codeClassifyDO.setName(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"NAME")));
+				codeClassifyDO.setBtmTypeId(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"BTMTYPEID")));
+				codeClassifyDO.setBtmTypeName(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getMapValueIgnoreCase(data,"BTMTYPENAME")));
 				oidList.add(codeClassifyDO);
 			}
 		}
@@ -1313,6 +1489,19 @@
 	}
 
 	/**
+	 * 鏌ヨ鎵�鏈変笂灞傜埗鑺傜偣鐨刼id
+	 * @param oid
+	 * @return
+	 */
+	@Override
+	public List<String> selectAllParentOid(String oid){
+		if(Func.isBlank(oid)){
+			return new ArrayList<>();
+		}
+		return this.codeClassifyMapper.selectAllParentOid(oid);
+	}
+
+	/**
 	 * 浣跨敤鍒嗙被涓婚敭鑾峰彇鍒嗙被鐩稿叧鐨勬墍鏈変俊鎭�
 	 *
 	 * @param codeClassifyOid 鍒嗙被鐨勪富閿�

--
Gitblit v1.9.3