From 19a9bc81ca7d90046b67f35adc5b7386be53e27f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 04 一月 2024 15:46:16 +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 | 113 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 91 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 32c2f3b..f2d1d0b 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
@@ -49,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;
@@ -92,7 +93,7 @@
private IBtmTypeClient btmTypeClient;
@Resource
- private CommonsMapper commonsMapper;
+ private ISysClient sysClient;
/**
* 鏃ュ織
@@ -582,18 +583,67 @@
return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
});
-
- 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);
+ //瓒呯鏄剧ず鎵�鏈夊垎绫�
+ if(VciBaseUtil.checkAdminTenant()){
+ 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);
+ }
}
+ }else {
+ // 閭ｄ簺鍒嗙被鍏峰鏌ョ湅鏉冮檺
+ R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(Arrays.asList(AuthUtil.getUser().getRoleId().split(",")));
+ // 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭d闆嗗悎涓虹┖
+ if(!viewClassByRoleIds.isSuccess() && !viewClassByRoleIds.getData().isEmpty()){
+ return new ArrayList<>();
+ }
+ // 杩囨护
+ filterTreeNodes(tree,viewClassByRoleIds.getData());
}
return tree;
+ }
+
+ /**
+ * 鍒嗙被鎺堟潈杩囨护鎺夋病鏈夋潈闄愮殑鍒嗙被
+ * @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 = codeClassifyMapper.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();
+ }
+ }
+ }
+
+ 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;
}
/**
@@ -670,7 +720,7 @@
* @return
*/
public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
- List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId(),fieldInPath);
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,fieldInPath,AuthUtil.getTenantId());
List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
return voList;
@@ -688,7 +738,10 @@
if(codeClassifies.isEmpty()){
return "";
}
- String oids = codeClassifies.stream().map(CodeClassify::getOid).collect(Collectors.joining(","));
+ String oids = codeClassifies.stream()
+ .map(CodeClassify::getOid)
+ .map(s -> "'" + s + "'")
+ .collect(Collectors.joining(","));;
return oids;
}
@@ -708,28 +761,31 @@
QueryWrapper<CodeBasicSec> secWrapper = new QueryWrapper<>();
secWrapper.eq("PKCODERULE",codeAllCodeVO.getCodeRuleOid());
secWrapper.eq("SECTYPE","codeserialsec");
- CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(secWrapper);
+ 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",codeBasicSec.getOid());
- CodeSerialValue codeSerialValue = codeSerialValueMapper.selectOne(wrapper);
- if(codeSerialValue == null){
+ 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(codeBasicSec.getOid());
+ newSerialValue.setCodeSecOid(codeBasicSecs.get(0).getOid());
newSerialValue.setSerialUnit(codeAllCodeVO.getSerialUnit());
newSerialValue.setMaxSerial(codeAllCodeVO.getUnFillSerial());
newSerialValue.setLctid("defaultLC");
newSerialValue.setLcStatus("Exist");
codeSerialValueMapper.insert(newSerialValue);
}else{
- codeSerialValue.setMaxSerial(codeAllCodeVO.getUnFillSerial());
- codeSerialValue.setLastModifyTime(new Date());
- codeSerialValue.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
- codeSerialValue.setTs(new Date());
- codeSerialValueMapper.updateById(codeSerialValue);
+ 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("鎿嶄綔鎴愬姛锛�");
@@ -1402,6 +1458,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