Merge remote-tracking branch 'origin/master'

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

@@ -30,7 +30,7 @@ public class SubConfigServiceImpl implements SubConfigService {
             "urladdr", "insttype", "roption", "global", "base", "editPage", "id",
             "rowEdit", "layout", "form", "data", "tableColumnName", "columns",
             "tableColumnType", "tableName", "label", "dataSource", "formData",
-            "insttype", "heads", "field","fullpid"
+            "insttype", "heads", "field","fullpid","linkUrl"
     };
 
     private final String[] TYPE_NAME = {
@@ -77,7 +77,7 @@ public class SubConfigServiceImpl implements SubConfigService {
         String subsystemId = fullPid.split(",")[1];
         // 查询页面展示的所有字段
         IPage<KdSubsystemDetailVo> res = new Page<>();
-        res.setRecords(getTableNameByData(pagePart,pagePartId,subsystemId));
+        res.setRecords(getTableNameByData(pagePart,subsystemId));
         return R.ok(res);
     }
 
@@ -157,7 +157,7 @@ public class SubConfigServiceImpl implements SubConfigService {
      * @author shangmi
      */
 
-    public List<KdSubsystemDetailVo> getTableNameByData(String pagePart,String pagePartId,String subsystemId) {
+    public List<KdSubsystemDetailVo> getTableNameByData(String pagePart,String subsystemId) {
         boolean instType = "table".equals(JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart).get(JSON_NAME[16])).get(JSON_NAME[17])).get(JSON_NAME[18], String.class));
         // 获得layout中的form
         List<String> form = JSONUtil.toList(JSONUtil.parseObj(JSONUtil.parseObj(pagePart).get(JSON_NAME[8])).get(instType ? JSON_NAME[19] : JSON_NAME[9], String.class), String.class);
@@ -167,6 +167,8 @@ public class SubConfigServiceImpl implements SubConfigService {
                 .filter(Objects::nonNull).collect(Collectors.toList());
         // 获取到columns中的base集合
         List<String> base = JSONUtil.toList(JSONUtil.parseObj(JSONUtil.parseObj(pagePart).get(JSON_NAME[12])).get(JSON_NAME[4], String.class), String.class);
+        //获得FromID
+        String[] linkUrl = JSONUtil.parseObj(JSONUtil.parseObj(JSONUtil.parseObj(pagePart).get(JSON_NAME[3])).get(JSON_NAME[4])).get(JSON_NAME[22], String.class).split("/");
         // 遍历获取base中的信息
         return base.stream()
                 .filter(info -> tableColumNameList.contains(JSONUtil.parseObj(JSONUtil.parseObj(info).get(JSON_NAME[4])).get(JSON_NAME[11], String.class)))
@@ -176,7 +178,7 @@ public class SubConfigServiceImpl implements SubConfigService {
                     String tableColumnNane = json.get(JSON_NAME[11], String.class);
                     kdSubsystemDetail.setTABLECOLUMNNANE(tableColumnNane);
                     kdSubsystemDetail.setPID(subsystemId);
-                    kdSubsystemDetail.setFROMID(pagePartId);
+                    kdSubsystemDetail.setFROMID(linkUrl[linkUrl.length-1]);
                     kdSubsystemDetail.setTABLECOLUMNTYPE(json.get(JSON_NAME[13], String.class));
                     kdSubsystemDetail.setTABLENAME(json.get(JSON_NAME[14], String.class));
                     kdSubsystemDetail.setLABEL(json.get(JSON_NAME[15], String.class));