kwha / Taken_BI_Manager_renewal star
하관우 하관우 04-28
Merge remote-tracking branch 'origin/back_end' into back_end
@baac2c2d3f6a06bfddce7b42ba4f494b1b9673e5
aa02808
baac2c2
src/main/java/com/takensoft/taken_bi_manager/custom/service/impl/CustomServiceImpl.java
--- src/main/java/com/takensoft/taken_bi_manager/custom/service/impl/CustomServiceImpl.java
+++ src/main/java/com/takensoft/taken_bi_manager/custom/service/impl/CustomServiceImpl.java
@@ -418,6 +418,12 @@
 
         childSpritter.setStyleSheet(styleSheet);
 
         childSpritter.setPage(pageInfo);
 
 
+        LayoutSj layoutSj = customDAO.componentTitleSelect(childSpritter);
 
+        if (layoutSj != null) {
 
+            childSpritter.setUseSj(true);
 
+            childSpritter.setLayoutSj(layoutSj);
 
+        }
 
+
 
         if (childSpritter.getSe().equals("component")) {
 
             CustomComponentVO childComponent = customDAO.componentSelect(childSpritter);
 
             childComponent.getComponent_itm().setPage(pageInfo);
@@ -495,12 +501,6 @@
 
             }
 
             childSpritter.setComponent(childComponent);
 
         } else if (childSpritter.getSe().equals("splitter")) {
 
-            LayoutSj layoutSj = customDAO.componentTitleSelect(childSpritter);
 
-            if (layoutSj != null) {
 
-                childSpritter.setUseSj(true);
 
-                childSpritter.setLayoutSj(layoutSj);
 
-            }
 
-
 
             List<CustomSplitterVO> childrenList = customDAO.splitterOneSelect(childSpritter);
 
             for(CustomSplitterVO child : childrenList){
 
                 setChildInfo(child, pageInfo);
Add a comment
List