feature 代码提交

cx-knowledge-base/cx-knowledge-base-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SubConfigServiceImpl.java

@@ -129,13 +129,15 @@ public class SubConfigServiceImpl implements SubConfigService {
         }
         R sysPagePart = rwAdminFeign.infoPagePart(pagePartId);
         JSONObject pagePart = JSONUtil.parseObj(sysPagePart.getData());
-        if (InsttypeEnum.TABLE.getMassage().equals(pagePart.get(JSON_NAME[1], String.class)) && !JSONUtil.parseObj(
-                JSONUtil.parseObj(JSONUtil.parseObj(pagePart
-                                .get(JSON_NAME[2])).get(JSON_NAME[3]))
-                        .get(JSON_NAME[4])).get(JSON_NAME[7], Boolean.class)) {
+        if (InsttypeEnum.TABLE.getMassage().equals(pagePart.get(JSON_NAME[1], String.class))) {
             // 判断当前页面如果是table页且非行编辑时，将内部editPage页的ID获取并重新调用本方法
-            return getPagePart(JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart.get(JSON_NAME[2]))
-                    .get(JSON_NAME[3])).get(JSON_NAME[4])).get(JSON_NAME[5])).get(JSON_NAME[6], String.class));
+            if(!JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart.get(JSON_NAME[2])).get(JSON_NAME[3]))
+                            .get(JSON_NAME[4])).get(JSON_NAME[7], Boolean.class)){
+                return pagePart.get(JSON_NAME[2], String.class);
+            }else{
+                return getPagePart(JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart.get(JSON_NAME[2]))
+                        .get(JSON_NAME[3])).get(JSON_NAME[4])).get(JSON_NAME[5])).get(JSON_NAME[6], String.class));
+            }
         } else if (InsttypeEnum.FORM.getMassage().equals(pagePart.get(JSON_NAME[1], String.class))
                 || (InsttypeEnum.TABLE.getMassage().equals(pagePart.get(JSON_NAME[1], String.class))
                 && JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart