Merge branch 'tolag3'
This commit is contained in:
parent
39ad65b0a5
commit
1840e1c253
@ -1212,16 +1212,15 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void menuDepth2ChildCnt(List<MenuManageJTreeVO> menuResultList) {
|
private void menuDepth2ChildCnt(List<MenuManageJTreeVO> menuResultList) {
|
||||||
|
List<MenuManageJTreeVO> list = new ArrayList<MenuManageJTreeVO>(menuResultList.stream().filter(t -> "2".equals(t.getDepths())).collect(Collectors.toList()));
|
||||||
for(MenuManageJTreeVO tmpVO : menuResultList.stream().filter(t -> "2".equals(t.getDepths())).collect(Collectors.toList())) {
|
for(MenuManageJTreeVO tmpVO : list) {
|
||||||
|
|
||||||
tmpVO.setChildMenuCnt(
|
tmpVO.setChildMenuCnt(
|
||||||
new Long(menuResultList.stream()
|
new Long(menuResultList.stream()
|
||||||
.filter( t ->
|
.filter( t ->
|
||||||
tmpVO.getMenuNo().equals(t.getUpperMenuId())
|
tmpVO.getMenuNo().equals(t.getUpperMenuId())
|
||||||
)
|
)
|
||||||
.count())
|
.count()
|
||||||
.intValue()
|
).intValue()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function zoomIn() { // 화면크기확대
|
function zoomIn() { // 화면크기확대
|
||||||
nowZoom = nowZoom + 20;
|
nowZoom = nowZoom + 10;
|
||||||
if(nowZoom >= 200) nowZoom = 200; // 화면크기 최대 확대율 200%
|
if(nowZoom >= 200) nowZoom = 200; // 화면크기 최대 확대율 200%
|
||||||
zooms();
|
zooms();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user