|
@ -1196,7 +1196,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
String staffOrgPath) { |
|
|
String staffOrgPath) { |
|
|
// List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
|
|
|
// List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
|
|
|
Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, null); |
|
|
Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, null); |
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); |
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, |
|
|
|
|
|
currentStaffAgencyId, Arrays.asList(staffOrgPath), map.get("groupByTables")); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@NotNull |
|
|
@NotNull |
|
@ -2241,7 +2242,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
// List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
|
|
|
// List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
|
|
|
List<String> exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList()); |
|
|
List<String> exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList()); |
|
|
Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList); |
|
|
Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList); |
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); |
|
|
return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, |
|
|
|
|
|
currentStaffAgencyId, Arrays.asList(staffOrgPath), map.get("groupByTables")); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|