Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
This commit is contained in:
@@ -207,7 +207,13 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
|
||||
|
||||
|
||||
public MtbColrKey getKey() {
|
||||
return new MtbColrKey(gestione, serCollo, dataCollo, numCollo, riga);
|
||||
return UtilityString.isNullOrEmpty(gestione) ||
|
||||
UtilityString.isNullOrEmpty(serCollo) ||
|
||||
dataCollo == null ||
|
||||
numCollo == null ||
|
||||
riga == null ?
|
||||
null :
|
||||
new MtbColrKey(gestione, serCollo, dataCollo, numCollo, riga);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -218,11 +218,11 @@ public class MtbColt extends EntityBase implements EquatableEntityInterface<MtbC
|
||||
|
||||
public MtbColtKey getKey() {
|
||||
return UtilityString.isNullOrEmpty(gestione) ||
|
||||
UtilityString.isNullOrEmpty(dataCollo) ||
|
||||
UtilityString.isNullOrEmpty(serCollo) ||
|
||||
dataCollo == null ||
|
||||
numCollo == null ?
|
||||
null :
|
||||
new MtbColtKey(gestione, serCollo, getDataCollo(), numCollo);
|
||||
new MtbColtKey(gestione, serCollo, dataCollo, numCollo);
|
||||
}
|
||||
|
||||
public String getGestione() {
|
||||
|
||||
Reference in New Issue
Block a user