diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java index 0b2f14aa..0e00c824 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java @@ -5,6 +5,11 @@ package com.bonus.common.biz.constant; * @author bonus */ public class BmConfigItems { + + public static final String KU_GUAN_ROLE_IDS = "KuGuanRoleIDs"; + + public static final String WEI_XIU_ROLE_IDS = "KuGuanRoleIDs"; + public static final String LEASE_TASK_AUDIT_ROLE_KEYS = "LeaseTaskAuditRoleKeys"; public static final String BACK_TASK_AUDIT_ROLE_KEYS = "BackTaskAuditRoleKeys"; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java index 81cd0bac..51e09d0f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java @@ -116,10 +116,37 @@ public class BmConfigServiceImpl implements IBmConfigService if (StringUtils.isEmpty(value1)) { return value2; } else { - return value1; + return value1.trim(); } } + /**获取所设定的库管员role ids*/ + public List getKuGuanRoleIds() { + List list = new ArrayList(); + BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.KU_GUAN_ROLE_IDS); + if (Objects.nonNull(bmConfig)) { + String value = getValueWithDefault(bmConfig.getItemValue(), ""); + if (StringUtils.isNotEmpty(value)) { + list = Arrays.asList(value.split(",")); + } + } + return list; + } + + /**获取所设定的维修员role ids*/ + public List getWeiXiuRoleIds() { + List list = new ArrayList(); + BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.WEI_XIU_ROLE_IDS); + if (Objects.nonNull(bmConfig)) { + String value = getValueWithDefault(bmConfig.getItemValue(), ""); + if (StringUtils.isNotEmpty(value)) { + list = Arrays.asList(value.split(",")); + } + } + return list; + } + + /**获取所设定的领料审核角色列表*/ public List getLeaseTaskAuditRoleKeys() { List list = new ArrayList(); BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.LEASE_TASK_AUDIT_ROLE_KEYS); @@ -132,6 +159,7 @@ public class BmConfigServiceImpl implements IBmConfigService return list; } + /**获取所设定的退料审核角色列表*/ public List getBackTaskAuditRoleKeys() { List list = new ArrayList(); BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.BACK_TASK_AUDIT_ROLE_KEYS);