1

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

@@ -35,11 +35,16 @@ public class ${item.getCodeName()} implements Serializable {
      */
     <#comment>主键</#comment>
     <#if defield.isKeyDEField()==true>
+        <#if defield.getDefaultValue()?? && defield.getDefaultValue()!=''>
+    @DEField(isKeyField=true , defaultValue = "${defield.getDefaultValue()}")
+        <#else>
     @DEField(isKeyField=true)
         </#if>
+    <#else>
         <#comment>属性默认值</#comment>
         <#if defield.getDefaultValue()?? && defield.getDefaultValue()!=''>
-    <#-- @DEField(defaultValue = "${defield.getDefaultValue()}") -->
+    @DEField(defaultValue = "${defield.getDefaultValue()}")
+        </#if>
     </#if>
     <#comment>系统预置属性</#comment>
     <#if  defield.getPredefinedType?? && defield.getPredefinedType()??>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/I%DE%Service.java.ftl

@@ -3,6 +3,7 @@ TARGET=PSDATAENTITY
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.service;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -3,6 +3,7 @@ TARGET=PSDATAENTITY
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.service.impl;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
@@ -431,12 +432,12 @@ ${deaction.getRender().code}
                     </#list>
                 <#elseif item.isEnableAPIStorage()>
                     <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
-                        ${item.getPSSubSysServiceAPIDE().getCodeName()?uncap_first}ClientService.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${item.getCodeName()?lower_case}s,batchSize) ;
+        <#--${item.getPSSubSysServiceAPIDE().getCodeName()?uncap_first}ClientService.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${item.getCodeName()?lower_case}s,batchSize) ;-->
                     <#else>
                     </#if>
                 <#elseif item.isEnableNoSQLStorage() && item.getAllPSDEBDTables()??>
                     <#list item.getAllPSDEBDTables() as debdtable>
-        ${de.getCodeName()?uncap_first}Repository.createBatch(${item.getCodeName()?lower_case}s,batchSize);
+        <#--${de.getCodeName()?uncap_first}Repository.createBatch(${item.getCodeName()?lower_case}s,batchSize);-->
                     </#list>
                 </#if>
 
@@ -455,12 +456,12 @@ ${deaction.getRender().code}
                     </#list>
                 <#elseif item.isEnableAPIStorage()>
                     <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
-        ${item.getPSSubSysServiceAPIDE().getCodeName()?uncap_first}ClientService.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${item.getCodeName()?lower_case}s,batchSize) ;
+        <#--${item.getPSSubSysServiceAPIDE().getCodeName()?uncap_first}ClientService.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${item.getCodeName()?lower_case}s,batchSize) ;-->
                     <#else>
                     </#if>
                 <#elseif item.isEnableNoSQLStorage() && item.getAllPSDEBDTables()??>
                     <#list item.getAllPSDEBDTables() as debdtable>
-        ${de.getCodeName()?uncap_first}Repository.updateBatch(${item.getCodeName()?lower_case}s,batchSize);
+        <#--${de.getCodeName()?uncap_first}Repository.updateBatch(${item.getCodeName()?lower_case}s,batchSize);-->
                     </#list>
                 </#if>
 
@@ -479,12 +480,12 @@ ${deaction.getRender().code}
                     </#list>
                 <#elseif item.isEnableAPIStorage()>
                     <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
-        ${item.getPSSubSysServiceAPIDE().getCodeName()?uncap_first}ClientService.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${item.getCodeName()?lower_case}s) ;
+        <#--${item.getPSSubSysServiceAPIDE().getCodeName()?uncap_first}ClientService.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${item.getCodeName()?lower_case}s) ;-->
                     <#else>
                     </#if>
                 <#elseif item.isEnableNoSQLStorage() && item.getAllPSDEBDTables()??>
                     <#list item.getAllPSDEBDTables() as debdtable>
-        ${de.getCodeName()?uncap_first}Repository.removeBatch(idList);
+        <#--${de.getCodeName()?uncap_first}Repository.removeBatch(idList);-->
                     </#list>
                 </#if>
 
@@ -579,12 +580,8 @@ ${deaction.getRender().code}
             fieldFilter.setValue(${der.getMajorPSDataEntity().getKeyPSDEField().getCodeName()?lower_case});
             context.getCondition().add(fieldFilter);
         }
-        List<${de.getCodeName()}> list = new ArrayList<${de.getCodeName()}>();
-        Page<${pub.getPKGCodeName()}.core.repository.po.${de.getCodeName()}> ${detable.name?uncap_first}s = ${de.getCodeName()?uncap_first}Repository.searchDefault(context) ;
-        for(${pub.getPKGCodeName()}.core.repository.po.${de.getCodeName()} ${detable.name?uncap_first} : ${detable.name?uncap_first}s){
-            list.add(${de.getCodeName()?uncap_first}Repository.convert2Domain(${detable.name?uncap_first},null));
-        }
-        return new PageImpl<${item.getCodeName()}>(list, context.getPageable(), ${detable.name?uncap_first}s.getTotalElements());
+        Page<${de.getCodeName()}> ${item.getCodeName()?uncap_first}s = searchDefault(context) ;
+        return new PageImpl<${item.getCodeName()}>(${item.getCodeName()?uncap_first}s.getContent(), context.getPageable(), ${item.getCodeName()?uncap_first}s.getTotalElements());
         </#if>
         </#list>
         <#elseif item.isEnableAPIStorage()>