Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
dea82cb1c1
|
@ -160,6 +160,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
|
||||||
yylxMap.put("categoryId",yylxPar.getCategoryId());
|
yylxMap.put("categoryId",yylxPar.getCategoryId());
|
||||||
yylxMap.put("typeId",yylxPar.getTypeId());
|
yylxMap.put("typeId",yylxPar.getTypeId());
|
||||||
yylxMap.put("children","");
|
yylxMap.put("children","");
|
||||||
|
yylxMap.put("parentIzEnabled",par.getIzEnabled());
|
||||||
yylxMapList.add(yylxMap);
|
yylxMapList.add(yylxMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -190,6 +191,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
|
||||||
List<Map<String,Object>> wllxMap2List = new ArrayList<Map<String,Object>>();
|
List<Map<String,Object>> wllxMap2List = new ArrayList<Map<String,Object>>();
|
||||||
for(Map<String,Object> wllxPar : wllxMapList){
|
for(Map<String,Object> wllxPar : wllxMapList){
|
||||||
if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){
|
if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){
|
||||||
|
wllxPar.put("parentIzEnabled",par.getIzEnabled());
|
||||||
wllxMap2List.add(wllxPar);
|
wllxMap2List.add(wllxPar);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -207,6 +209,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
|
||||||
infoMap.put("izEnabled",par.getIzEnabled());
|
infoMap.put("izEnabled",par.getIzEnabled());
|
||||||
infoMap.put("children",wllxMap2List);
|
infoMap.put("children",wllxMap2List);
|
||||||
infoMap.put("categoryId",par.getId());
|
infoMap.put("categoryId",par.getId());
|
||||||
|
infoMap.put("parentIzEnabled",par.getIzEnabled());
|
||||||
infoMapList.add(infoMap);
|
infoMapList.add(infoMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue