Finish Hotfix-53
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -58,3 +58,4 @@ modules.xml
|
||||
*/target/*
|
||||
*.ckie
|
||||
/ts
|
||||
/temp
|
||||
|
||||
@@ -342,7 +342,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
|
||||
this.dataCompleting = dataCompleting;
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
// @JsonIgnore
|
||||
public Boolean getOnlyPkMaster() {
|
||||
return onlyPkMaster;
|
||||
}
|
||||
@@ -359,7 +359,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
|
||||
this.nativeSql = nativeSql;
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
// @JsonIgnore
|
||||
public HashMap<String, Object> getOldPk() {
|
||||
return oldPk;
|
||||
}
|
||||
@@ -369,7 +369,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
|
||||
return this;
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
// @JsonIgnore
|
||||
public Boolean getExecuteRecalc() {
|
||||
return executeRecalc;
|
||||
}
|
||||
@@ -378,7 +378,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
|
||||
this.executeRecalc = executeRecalc;
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
// @JsonIgnore
|
||||
public String getWhereCond() {
|
||||
return whereCond;
|
||||
}
|
||||
@@ -1441,7 +1441,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
|
||||
}
|
||||
|
||||
if (containsIdentity) {
|
||||
if(insertedIdentity < 0)
|
||||
if (insertedIdentity < 0)
|
||||
throw new Exception("Impossibile leggere il campo identity anche se è richiesto");
|
||||
|
||||
Field identityField = getEntityHolder().getFieldBySql(getClass().getSimpleName(), identityFieldName);
|
||||
|
||||
Reference in New Issue
Block a user