From 13e07d48a90efdaee8b89e96a1d97a42f19777d7 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 25 十月 2023 22:43:53 +0800 Subject: [PATCH] 1、修改从其他规则克隆规则时排序号未重排的bug。 2、为密码策略管理、用户管理、部门管理界面增加按钮权限控制 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java index 269230b..760a3e1 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatServiceImpl.java @@ -135,7 +135,7 @@ @Override public CodeKeyAttrRepeatVO getRuleByClassifyFullInfo(CodeClassifyFullInfoBO classifyFullInfo) { VciBaseUtil.alertNotNull(classifyFullInfo,"涓婚搴撳垎绫荤殑淇℃伅"); - String keyAttrRuleOid = classifyFullInfo.getCurrentClassifyVO().getCodekeyattrrepeatoid(); + String keyAttrRuleOid = classifyFullInfo.getCurrentClassifyVO().getCodeKeyAttrRepeatOid(); if(StringUtils.isBlank(keyAttrRuleOid)){ //鎴戜滑鏍规嵁涓婄骇鐨勫垎绫伙紝鎸夌収灞傜骇鍊掑簭鎺掑垪 if(!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())){ @@ -144,8 +144,8 @@ for(int i = sortedClassifyVO.size() -1;i>=0;i--){ CodeClassifyVO record = sortedClassifyVO.get(i); - if(StringUtils.isNotBlank(record.getCodekeyattrrepeatoid())){ - keyAttrRuleOid = record.getCodekeyattrrepeatoid(); + if(StringUtils.isNotBlank(record.getCodeKeyAttrRepeatOid())){ + keyAttrRuleOid = record.getCodeKeyAttrRepeatOid(); break; } } -- Gitblit v1.9.3