修复索引同步空值问题

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/mapping/%DE%InheritMapping.java.ftl

@@ -41,14 +41,13 @@ import ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
 import ${pub.getPKGCodeName()}.core.${majorIndexDE.getPSSystemModule().getCodeName()?lower_case}.domain.${majorIndexDE.codeName};
 import java.util.List;
 
-@Mapper(componentModel = "spring", uses = {},
-    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
-    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+@Mapper(componentModel = "spring", uses = {})
 public interface ${de.codeName}InheritMapping {
 
     @Mappings({
         @Mapping(source ="${MinorIndexDEKeyFieldCodeName}",target = "${majorIndexDEKeyFieldCodeName}"),
         @Mapping(source ="${MinorIndexDEMajorTextFieldCodeName}",target = "${majorIndexDEMajorTextFieldCodeName}"),
+        @Mapping(target ="focusNull",ignore = true),
         <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
             <#comment>排除主键及主文本属性</#comment>
@@ -69,6 +68,7 @@ public interface ${de.codeName}InheritMapping {
     @Mappings({
         @Mapping(source ="${majorIndexDEKeyFieldCodeName}" ,target = "${MinorIndexDEKeyFieldCodeName}"),
         @Mapping(source ="${majorIndexDEMajorTextFieldCodeName}" ,target = "${MinorIndexDEMajorTextFieldCodeName}"),
+        @Mapping(target ="focusNull",ignore = true),
         <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
             <#comment>排除主键及主文本属性</#comment>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -288,10 +288,6 @@ ${deaction.getRender().code}
         <#if hasMinorPSDERs gt 0>
         fillParentData(et);
         </#if>
-        <#comment>同步更新索引主实体</#comment>
-        <#if isIndexSubDE>
-        ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et));
-        </#if>
         <#comment>附加数据逻辑-操作前</#comment>
         <@addBoforeLogic deaction/>
         <#if de.getKeyPSDEField()??>
@@ -323,6 +319,10 @@ ${deaction.getRender().code}
 		</#if>
         <#comment>成功后get填充一次完整信息</#comment>
         CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()),et);
+        <#comment>同步更新索引主实体</#comment>
+        <#if isIndexSubDE>
+        ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et));
+        </#if>
         <#comment>附加数据逻辑-操作后</#comment>
         <@addAfterLogic deaction/>
         return true;