diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 2d9a3ee26..da6f50d9b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -426,7 +426,7 @@ public class GlobalDataManaager implements IManager { } public TimeControllerOfFunction getOpenTimeOfFuntionCacheByType(FunctionIdEnum functionIdEnum ) { - List ids = SGlobalSystemConfig.idsByType.get(functionIdEnum); + List ids = SGlobalSystemConfig.idsByType.get(functionIdEnum.getFunctionType()); if(ids!=null && !ids.isEmpty()){ for(Integer id : ids){ if(openTimeOfFuntionCache.containsKey(id)){ diff --git a/tablemanager/src/main/java/config/SGlobalSystemConfig.java b/tablemanager/src/main/java/config/SGlobalSystemConfig.java index 8c87d4501..a22a3f783 100644 --- a/tablemanager/src/main/java/config/SGlobalSystemConfig.java +++ b/tablemanager/src/main/java/config/SGlobalSystemConfig.java @@ -47,10 +47,10 @@ public class SGlobalSystemConfig implements BaseConfig { public void init() throws Exception { Map> idsByTypeTmp = new HashMap<>(); STableManager.getConfig(SGlobalSystemConfig.class).forEach((id,item)->{ - if(!idsByTypeTmp.containsKey(item.getType())){ - idsByTypeTmp.put(item.getType(),new ArrayList<>()); + if(!idsByTypeTmp.containsKey(item.getIsIDdSame())){ + idsByTypeTmp.put(item.getIsIDdSame(),new ArrayList<>()); } - idsByTypeTmp.get(item.getType()).add(item.getId()); + idsByTypeTmp.get(item.getIsIDdSame()).add(item.getId()); }); idsByType = idsByTypeTmp; }