【feat】data_field增加字段是否更新
This commit is contained in:
parent
186100bb96
commit
401feb737e
@ -97,6 +97,13 @@ public class DataField implements Serializable {
|
||||
@ApiModelProperty(value = "是否可编辑")
|
||||
private Boolean isCreateable;
|
||||
|
||||
/**
|
||||
* 是否更新(目标库)
|
||||
*/
|
||||
@TableField("is_update")
|
||||
@ApiModelProperty(value = "是否更新")
|
||||
private Boolean isUpdate;
|
||||
|
||||
/**
|
||||
* 是否为空(目标库)
|
||||
*/
|
||||
|
||||
@ -999,6 +999,7 @@ public class CommonServiceImpl implements CommonService {
|
||||
dataField.setField(field.getName());
|
||||
dataField.setName(field.getLabel());
|
||||
dataField.setIsCreateable(field.getCreateable());
|
||||
dataField.setIsUpdate(field.getUpdateable());
|
||||
dataField.setIsNillable(field.getNillable());
|
||||
dataField.setIsDefaultedOnCreate(field.getDefaultedOnCreate());
|
||||
String join = null;
|
||||
|
||||
@ -818,7 +818,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
|
||||
//根据旧sfid查找引用对象新sfid
|
||||
if (field.equals("Id")) {
|
||||
account.setId(String.valueOf(map.get("new_id")));
|
||||
} else if (!DataUtil.isUpdate(field) || (dataField.getIsCreateable() != null && !dataField.getIsCreateable())) {
|
||||
} else if (!DataUtil.isUpdate(field) || (dataField.getIsUpdate() != null && !dataField.getIsUpdate())) {
|
||||
continue;
|
||||
} else if ("reference".equals(dataField.getSfType()) && map.get(dataField.getField()) != null) {
|
||||
|
||||
@ -1020,7 +1020,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
|
||||
//根据旧sfid查找引用对象新sfid
|
||||
if (field.equals("Id")) {
|
||||
account.setId(String.valueOf(map.get("new_id")));
|
||||
} else if (!DataUtil.isUpdate(field) || (dataField.getIsCreateable() != null && !dataField.getIsCreateable())) {
|
||||
} else if (!DataUtil.isUpdate(field) || (dataField.getIsUpdate() != null && !dataField.getIsUpdate())) {
|
||||
continue;
|
||||
} else if ("reference".equals(dataField.getSfType()) && map.get(dataField.getField()) != null) {
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user