copyTo优化

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

@@ -365,20 +365,21 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
     </#if>
     <#if hasResetField>
     /**
-     * 复制当前对象数据到目标对象
-     * @param targetEntity
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
      * @param <T>
      * @return
      */
     @Override
-    public <T> T copyTo(T targetEntity) {
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
         <#list de.getPSDEFields() as defield>
             <#if defield.isPasteReset()==true>
                 <#assign columnname = defield.getName()?lower_case>
         this.reset("${columnname}");
             </#if>
         </#list>
-        return super.copyTo(targetEntity);
+        return super.copyTo(targetEntity,bIncEmpty);
     }
     </#if>
 }
@@ -745,20 +746,21 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable
         </#if>
         <#if hasResetField>
     /**
-     * 复制当前对象数据到目标对象
-     * @param targetEntity
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
      * @param <T>
      * @return
      */
     @Override
-    public <T> T copyTo(T targetEntity) {
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
             <#list de.getPSDEFields() as defield>
                 <#if defield.isPasteReset()==true>
                     <#assign columnname = defield.getName()?lower_case>
         this.reset("${columnname}");
                 </#if>
             </#list>
-        return super.copyTo(targetEntity);
+        return super.copyTo(targetEntity,bIncEmpty);
     }
         </#if>
     </#if>

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/domain/EntityBase.java.ftl

@@ -103,24 +103,21 @@ public class EntityBase implements Serializable {
 
     /**
     * 复制当前对象数据到目标对象
-    * @param targetEntity
+    * @param targetEntity 目标数据对象
+    * @param bIncEmpty  是否包括空值
     * @param <T>
     * @return
     */
-    public <T> T copyTo(T targetEntity){
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty){
             if(targetEntity instanceof EntityBase){
                 EntityBase target= (EntityBase) targetEntity;
                 Hashtable<String, Field> sourceFields=DEFieldCacheMap.getFieldMap(this.getClass());
                 for(String field : sourceFields.keySet()){
                     Object value=this.get(field);
-                if(ObjectUtils.isEmpty(value))
-                    continue;
+                    if( !ObjectUtils.isEmpty(value) ||  ObjectUtils.isEmpty(value) &&  getFocusNull().contains(field) &&  bIncEmpty ){
                         target.set(field,value);
                 }
-            if(!ObjectUtils.isEmpty(this.getFocusNull()))
-                target.getFocusNull().addAll(this.getFocusNull());
-            if(!ObjectUtils.isEmpty(this.getExtensionparams()))
-                target.getExtensionparams().putAll(this.getExtensionparams());
+            }
         }
         return targetEntity;
     }