From ba642d2510ca51edf0b5e64a78b0088fe2ee3b4f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 18:03:11 +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 |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 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 59e2b3a..1f12c5a 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
@@ -132,6 +132,13 @@
 		if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
 			return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔$被鍨�");
 		}
+		QueryWrapper<CodeClassify> classifyQueryWrapper = new QueryWrapper<>();
+		classifyQueryWrapper.eq("parentCodeClassifyOid",codeClassifyEntity.getParentCodeClassifyOid());
+		classifyQueryWrapper.eq("id",codeClassifyEntity.getId());
+		List<CodeClassify> codeClassifyList = baseMapper.selectList(classifyQueryWrapper);
+		if(codeClassifyList.size()!=0){
+			return R.fail("褰撳墠鍒嗙被涓嬩笉鍏佽鍒嗙被缂栧彿閲嶅锛岃妫�鏌ワ紒锛侊紒");
+		}
 		codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
 		codeClassifyEntity.setCreateTime(new Date());
 		codeClassifyEntity.setTs(new Date());
@@ -521,6 +528,57 @@
 		List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
 		return voList;
 	}
+
+	/***
+	 *
+	 * @param parentOid
+	 * @return
+	 */
+	@Override
+	public List<CodeClassifyVO> selectCodeClassifyVOByParentId(String parentOid) {
+		List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyDOByParentId(parentOid,AuthUtil.getTenantId());
+		List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+		return voList;
+	}
+
+	/**
+	 * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫�
+	 * @param libName
+	 * @return
+	 */
+	@Override
+	public List<CodeClassifyVO> getRMLibByName(String libName) {
+		List<String> libNameList=new ArrayList<>();
+		if(StringUtils.isNotBlank(libName)){
+			libNameList=VciBaseUtil.str2List(libName);
+		}
+		List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId());
+		List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+		return voList;
+	}
+
+	/***
+	 * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
+	 * @param desc
+	 * @param codeLibName
+	 * @return
+	 */
+	@Override
+	public List<CodeClassifyVO> getRMTypeByDescAndLib(String desc, String codeLibName) {
+		List<CodeClassify> doList =codeClassifyMapper.getRMTypeByDesc(desc,"Enabled",AuthUtil.getTenantId());
+		if (CollectionUtils.isEmpty(doList)) {
+			return new LinkedList<CodeClassifyVO>();
+		}
+		CodeClassify codeClassify=doList.get(0);
+		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllParenClassifytByOid(codeClassify.getOid(),AuthUtil.getTenantId());
+		CodeClassify currentLib = codeClassifyList.get(codeClassifyList.size() - 1);
+		if (!currentLib.getName().equals(codeLibName)) {
+			return new ArrayList<>();
+		}
+		List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
+		return voList;
+	}
+
 	/**
 	 * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
 	 *

--
Gitblit v1.9.3