Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Valerio Castellana
2024-02-21 12:38:31 +01:00
parent 7acd898115 3b269da398
commit bb159584f0
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-core/src/main/java/it/integry/ems_model/utility/UtilityDB.java
View File

@@ -2,6 +2,7 @@ package it.integry.ems_model.utility;
import com.annimon.stream.Stream;
import it.integry.common.var.CommonConstants;
import it.integry.ems_model.annotation.EntityChild;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.base.EntityPropertyHolder;
import it.integry.ems_model.config.EmsRestConstants;
@@ -171,9 +172,14 @@ public class UtilityDB {
}
}
EntityChild childConstraintDetails = field.getAnnotation(EntityChild.class);
if (childConstraintDetails.copyPk()) {
list = testata.selectEntityRowList(conn, testata, rowClass, keyType, whereCond);
} else {
final EntityBase tmpChildEntity = rowClass.newInstance();
tmpChildEntity.setImportFromParent(testata, true);
list = tmpChildEntity.select(conn, whereCond);
}
return list;
}