bug fix

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/EntityModel.java

@@ -428,10 +428,13 @@ public class EntityModel  extends BaseModel {
         {
             for(RelationshipModel rel:this.getReferences())
             {
-                if(((PSDER1NImpl)rel.getDer()).getPSDER1NDEFieldMaps()==null)
-                    continue;
+
                 if(rel.getRelEntity().getStorage().equals("NONE"))
                     continue;
+                if(!(rel.getDer() instanceof PSDER1NImpl))
+                    continue;
+                if(((PSDER1NImpl)rel.getDer()).getPSDER1NDEFieldMaps()==null)
+                    continue;
                 for(IPSDER1NDEFieldMap derField : ((PSDER1NImpl)rel.getDer()).getPSDER1NDEFieldMaps())
                 {
                     if(derField.getMapType().equals("COUNT") || derField.getMapType().equals("SUM")
@@ -618,7 +621,7 @@ public class EntityModel  extends BaseModel {
                     if(der.getMajorPSDataEntity().getKeyPSDEField()!=null)
                     {
                         LookupModel lookupModel = new LookupModel().setRelationid(der.getId())
-                                .setFieldname(this.getKeyField().getName()).setCodeName(this.getKeyField().getCodeName())
+                                .setFieldname(this.getDataEntity().getMajorPSDEField().getName()).setCodeName(this.getDataEntity().getMajorPSDEField().getCodeName())
                                 .setReffieldname(der.getMajorPSDataEntity().getKeyPSDEField().getName()).setRefCodeName(der.getMajorPSDataEntity().getKeyPSDEField().getCodeName());
                         rel.addLookup(lookupModel);
                     }

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/service/impl/{{entities@SQL}}ServiceImpl.java.hbs

@@ -236,19 +236,19 @@ public class {{entity.codeName}}ServiceImpl extends ServiceImpl<{{entity.codeNam
             if(!ObjectUtils.isEmpty(key))
                 keys.add(key);
         });
-        List<{{entity.codeName}}> create=new ArrayList<>();
-        List<{{entity.codeName}}> update=new ArrayList<>();
+        List<{{entity.codeName}}> _create=new ArrayList<>();
+        List<{{entity.codeName}}> _update=new ArrayList<>();
         list.forEach(et-> {
             Serializable key = et.get{{pascalCase entity.keyField.codeName}}();
             if(keys.contains(key))
-                update.add(et);
+                _update.add(et);
             else
-                create.add(et);
+                _create.add(et);
         });
         List rtList=new ArrayList<>();
-        if(update.size()>0 && (!{{camelCase entity.codeName}}Service.updateBatch(update)))
+        if(_update.size()>0 && (!{{camelCase entity.codeName}}Service.updateBatch(_update)))
             return false;
-        if(create.size()>0 && (!{{camelCase entity.codeName}}Service.createBatch(create)))
+        if(_create.size()>0 && (!{{camelCase entity.codeName}}Service.createBatch(_create)))
             return false;
         return true;
     }