From 0e5ba7238d31dc8fb5015001661811dceab55c42 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期三, 13 九月 2023 09:02:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java index b0163b3..6a3d868 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java @@ -746,7 +746,29 @@ return dataList; } - /** + /** + * 鏍规嵁褰撳墠鐢宠缂栫爜鐨勫垎绫伙紝閫愬眰寰�涓婃牎楠屾槸鍚︾鍚堝睘浜庨厤缃殑涓殑鍒嗙被瀛愯妭鐐圭殑鍒� + * 绫伙紝濡傛灉绗﹀悎锛屽垯璇ュ垎绫荤敵璇风殑缂栫爜涓洪泦鍥㈢爜杩斿洖true锛屽弽涔嬪垯涓轰紒涓氱紪鐮佽繑鍥瀎alse + * @param parameter 浼犲叆鏁版嵁,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id + */ + @Override + public R checkGroupCode(Map<String, String> parameter) { + List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParents(parameter.get("oid")); + Set<String> configGroupCode = Arrays.stream(parameter.get("classifyGroupCode").split("#")).collect(Collectors.toSet()); +// Boolean checkGroupFlag = false;//鏄惁鏌ヨ鍒伴厤缃殑椤跺眰鍒嗙被涓� + for (int i = codeClassifyList.size()-1; i >= 0; i--) { + if(configGroupCode.contains(codeClassifyList.get(i).getId())){ +// checkGroupFlag = true; + return R.data("true"); + } +// if(checkGroupFlag && parameter.get("nowApplyCode").equals(codeClassifyList.get(i).getId())){ +// return R.data(true); +// } + } + return R.data("false"); + } + + /** * 灏佽鍏抽敭灞炴�х殑鏌ヨ璇彞 * * @param value 褰撳墠鐨勫�� @@ -2408,7 +2430,6 @@ return phaseAttrService.listAttrByTemplateOidAndPhaseId(templateVO.getOid(), phase); } - /** * 璺緞涓婂寘鍚綋鍓嶅垎绫荤殑鎵�鏈夊垎绫讳俊鎭� * @@ -2756,13 +2777,13 @@ CodeSecTypeEnum.CODE_FIXED_SEC.getValue(), CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(), CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(), - CodeSecTypeEnum.CODE_REFER_SEC.getValue() + CodeSecTypeEnum.CODE_REFER_SEC.getValue(), + CodeSecTypeEnum.CODE_DATE_SEC.getValue() ); // 鍙鐮佹绫诲瀷 List<String> readOnlyTypes = Arrays.asList( CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(), - CodeSecTypeEnum.CODE_ATTR_SEC.getValue(), - CodeSecTypeEnum.CODE_DATE_SEC.getValue() + CodeSecTypeEnum.CODE_ATTR_SEC.getValue() ); // 闅愯棌鐮佹绫诲瀷 /*List<String> hideType = Arrays.asList( -- Gitblit v1.9.3