diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index b76fc6fc..099d14bd 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -216,11 +216,11 @@ public class IdcServiceImpl implements IdcService { List> keyList = dbDao.listKeyMysql(tnames[2]); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; - Map map = new HashMap(); - String sqlWhere = "not exists (select fkId from idc_record where type='"+tnames[2]+"' and fkId="+tnames[2]+"."+keyColumn+")"; + String sqlWhere = ""; if(!StringUtils.isEmpty(tnames[6])) { - sqlWhere+=" and "+tnames[6]+">=cast('"+lastUpdateTime+"' as datetime)"; + sqlWhere+=" "+tnames[6]+">=cast('"+lastUpdateTime+"' as datetime)"; } else { + sqlWhere = "not exists (select fkId from idc_record where type='"+tnames[2]+"' and fkId="+tnames[2]+"."+keyColumn+")"; map.put("isEnd", "1"); } map.put("sqlWhere", sqlWhere); @@ -523,16 +523,17 @@ public class IdcServiceImpl implements IdcService { } recordSql+=!StringUtils.isEmpty(recordSql) ? "," : ""; recordSql+="('"+UUID.randomUUID().toString().replaceAll("-", "")+"','"+tableName+"','"+list.get(m).get(keyColumn)+"','"+isEnd+"',now())"; - if(childNum>-1&¶ms.get("masterLinkColumn")!=null&&!StringUtils.isEmpty(params.get("masterLinkColumn").toString())&& - params.get("subLinkColumn")!=null&&!StringUtils.isEmpty(params.get("subLinkColumn").toString())) { + if(childNum>-1) { for(int z=0;z childMap = new HashMap<>(); - childMap.put(params.get("subLinkColumn").toString(), keyValue); - List> childList = getList(chidTnames[2],childMap); - list.get(m).put("tableName"+z, chidTnames[2]); - list.get(m).put("data"+z, childList); + if(!StringUtils.isEmpty(chidTnames[4])&&!StringUtils.isEmpty(chidTnames[5])) { + String keyValue = list.get(i).get(chidTnames[4]).toString(); + Map childMap = new HashMap<>(); + childMap.put(chidTnames[5], keyValue); + List> childList = getList(chidTnames[2],childMap); + list.get(m).put("tableName"+z, chidTnames[2]); + list.get(m).put("data"+z, childList); + } } } }