ibizdev提交

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFMember.java

@@ -131,7 +131,9 @@ public class WFMember extends EntityMP implements Serializable {
 
     @Override
     public Serializable getDefaultKey(boolean gen) {
-        return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getGroupid(),this.getUserid()).getBytes());
+        if((!ObjectUtils.isEmpty(this.getGroupid()))&&(!ObjectUtils.isEmpty(this.getUserid())))
+            return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getGroupid(),this.getUserid()).getBytes());
+        return null;
     }
 }
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFGroupServiceImpl.java

@@ -112,7 +112,7 @@ public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> impl
 
     @Override
     public void createBatch(List<WFGroup> list) {
-        saveBatch(list,batchSize);
+        this.saveBatch(list,batchSize);
     }
 
     @Override

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFMemberServiceImpl.java

@@ -77,7 +77,7 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
     @Override
     public void createBatch(List<WFMember> list) {
         list.forEach(item->fillParentData(item));
-        saveBatch(list,batchSize);
+        this.saveOrUpdateBatch(list,batchSize);
     }
 
     @Override
@@ -182,7 +182,7 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
         if(_update.size()>0)
             this.updateBatch(_update);
         if(_create.size()>0)
-            this.saveBatch(_create);
+            this.createBatch(_create);
         if(delIds.size()>0)
             this.removeBatch(delIds);
 	}

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessDefinitionServiceImpl.java

@@ -120,7 +120,7 @@ public class WFProcessDefinitionServiceImpl extends ServiceImpl<WFProcessDefinit
 
     @Override
     public void createBatch(List<WFProcessDefinition> list) {
-        saveBatch(list,batchSize);
+        this.saveBatch(list,batchSize);
     }
 
     @Override

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFSystemServiceImpl.java

@@ -114,7 +114,7 @@ public class WFSystemServiceImpl extends ServiceImpl<WFSystemMapper, WFSystem> i
 
     @Override
     public void createBatch(List<WFSystem> list) {
-        saveBatch(list,batchSize);
+        this.saveBatch(list,batchSize);
     }
 
     @Override

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFUserServiceImpl.java

@@ -130,7 +130,7 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
 
     @Override
     public void createBatch(List<WFUser> list) {
-        saveBatch(list,batchSize);
+        this.saveBatch(list,batchSize);
     }
 
     @Override