Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
f3fca07cf2
|
@ -426,7 +426,7 @@ public class GlobalDataManaager implements IManager {
|
|||
}
|
||||
|
||||
public TimeControllerOfFunction getOpenTimeOfFuntionCacheByType(FunctionIdEnum functionIdEnum ) {
|
||||
List<Integer> ids = SGlobalSystemConfig.idsByType.get(functionIdEnum);
|
||||
List<Integer> ids = SGlobalSystemConfig.idsByType.get(functionIdEnum.getFunctionType());
|
||||
if(ids!=null && !ids.isEmpty()){
|
||||
for(Integer id : ids){
|
||||
if(openTimeOfFuntionCache.containsKey(id)){
|
||||
|
|
|
@ -47,10 +47,10 @@ public class SGlobalSystemConfig implements BaseConfig {
|
|||
public void init() throws Exception {
|
||||
Map<Integer, List<Integer>> 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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue