diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 266f3dee..3dd32bb3 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -716,6 +716,17 @@ public class PythonService { if (CollectionUtil.isEmpty(attributeRetrievalList)) { System.out.println(attributeRetrievalAttrDict); System.out.println(tableName); + if (!StringUtils.isEmpty(style)) { + attributeRetrievalAttrDict.setType(null); + attributeRetrievalAttrDict.setOpeningType(null); + attributeRetrievalAttrDict.setSubtype(null); + attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style); + }else { + attributeRetrievalAttrDict.setType(null); + attributeRetrievalAttrDict.setOpeningType(null); + attributeRetrievalAttrDict.setSubtype(null); + attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style); + } } return toColoectionElementList(attributeRetrievalList, styleCategory, modelSex); }