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

Merge remote-tracking branch 'origin/release/3.0' into dev/dev

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java
#	src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
This commit is contained in:
shahaibo
2024-05-27 15:03:02 +08:00
parent 50e46fed02 37de7d9276
commit 8b274b2822
18 changed files with 131 additions and 74 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

@@ -679,7 +679,7 @@ public class PythonService {
}
if (attributeRetrievalAttrDict.getOpeningType() != null) {
nonNullFields.add("openingType");
if (tableName.equals("male_outwear")) {
if (tableName.equals("male_outwear") || tableName.equals("male_top") || tableName.equals("male_bottom")) {
nonNullFields.remove("openingType");
attributeRetrievalAttrDict.setOpeningType(null);
}
@@ -965,7 +965,7 @@ public class PythonService {
QueryWrapper<Dressing> qw = new QueryWrapper<>();
qw.lambda().eq(Dressing::getApparel, validateElementVO.getModelSex());
if (validateElementVO.getSingleOverall().equals(SingleOverallEnum.SINGLE.getRealName())) {
qw.lambda().eq(Dressing::getApparel, validateElementVO.getSwitchCategory());
qw.lambda().eq(Dressing::getStyleCategory, validateElementVO.getSwitchCategory());
}
List<Dressing> dressings = dressingMapper.selectList(qw);
if (CollectionUtil.isEmpty(dressings)) {