aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:design new single;

Browse Source
This commit is contained in:
shahaibo
2024-02-23 11:09:25 +08:00
parent 6e191413b9
commit 471cdd866b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -876,7 +876,7 @@ public class PythonService {
List<CollectionElement> noPinCollectionData = getNoPinData(validateElementVO); List<CollectionElement> noPinCollectionData = getNoPinData(validateElementVO);
if (CollectionUtil.isEmpty(noPinCollectionData)) { if (CollectionUtil.isEmpty(noPinCollectionData)) {
List<CollectionElement> sketchBoardPins = getPinDataWhole(validateElementVO); List<CollectionElement> sketchBoardPins = getPinDataWhole(validateElementVO);
if (validateElementVO.getSingleOverall().equals(SingleOverallEnum.SINGLE.getRealName())) { if (CollectionUtil.isNotEmpty(sketchBoardPins) && validateElementVO.getSingleOverall().equals(SingleOverallEnum.SINGLE.getRealName())) {
sketchBoardPins = sketchBoardPins.stream().filter(o -> o.getLevel2Type().equals(validateElementVO.getSwitchCategory())).collect(Collectors.toList()); sketchBoardPins = sketchBoardPins.stream().filter(o -> o.getLevel2Type().equals(validateElementVO.getSwitchCategory())).collect(Collectors.toList());
} }
if (CollectionUtil.isNotEmpty(sketchBoardPins)) { if (CollectionUtil.isNotEmpty(sketchBoardPins)) {
@@ -915,7 +915,7 @@ public class PythonService {
if (validateElementVO.getModelSex().equals(Sex.FEMALE.getValue())) { if (validateElementVO.getModelSex().equals(Sex.FEMALE.getValue())) {
sketchBoardCollectionElements = sketchBoardCollectionElements.stream().filter(o -> FEMALE_CATEGORY.contains(o.getLevel2Type())).collect(Collectors.toList()); sketchBoardCollectionElements = sketchBoardCollectionElements.stream().filter(o -> FEMALE_CATEGORY.contains(o.getLevel2Type())).collect(Collectors.toList());
} }
if (validateElementVO.getSingleOverall().equals(SingleOverallEnum.SINGLE.getRealName())) { if (CollectionUtil.isNotEmpty(sketchBoardCollectionElements) && validateElementVO.getSingleOverall().equals(SingleOverallEnum.SINGLE.getRealName())) {
sketchBoardCollectionElements = sketchBoardCollectionElements.stream().filter(o -> o.getLevel2Type().equals(validateElementVO.getSwitchCategory())).collect(Collectors.toList()); sketchBoardCollectionElements = sketchBoardCollectionElements.stream().filter(o -> o.getLevel2Type().equals(validateElementVO.getSwitchCategory())).collect(Collectors.toList());
} }
if (CollectionUtil.isNotEmpty(sketchBoardCollectionElements)) { if (CollectionUtil.isNotEmpty(sketchBoardCollectionElements)) {