update mybatis-jpa-extra-3.3.0

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java

@@ -114,10 +114,9 @@ public class AccountsService  extends JpaService<Accounts>{
 	   return this.getMapper().updateStatus(accounts) > 0;
    }
    
-   @Override
    public boolean remove(String id) {
        Accounts account = this.get(id);
-       if (super.remove(id)) {
+       if (super.delete(id)) {
               UserInfo loadUserInfo = null;
               if(provisionService.getApplicationConfig().isProvisionSupport()) {
                   loadUserInfo = userInfoService.findUserRelated(account.getUserId());

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java

@@ -60,7 +60,7 @@ public class AccountsStrategyService  extends JpaService<AccountsStrategy> imple
 	}
 	
 	public boolean deleteById(String groupId) {
-	    this.remove(groupId);
+	    this.delete(groupId);
 	    //groupMemberService.deleteByGroupId(groupId);
 	    return true;
 	}

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java

@@ -63,7 +63,7 @@ public class GroupMemberService  extends JpaService<GroupMember>{
 	
 	
 	public JpaPageResults<Groups> noMember(GroupMember entity) {
-		entity.setPageResultSelectUUID(entity.generateId());
+		entity.setPageSelectId(entity.generateId());
 		entity.setStartRow(calculateStartRow(entity.getPageNumber() ,entity.getPageSize()));
 		
 		entity.setPageable(true);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java

@@ -70,7 +70,7 @@ public class GroupsService  extends JpaService<Groups> implements Serializable {
 	}
 	
 	public boolean deleteById(String groupId) {
-	    this.remove(groupId);
+	    this.delete(groupId);
 	    groupMemberService.deleteByGroupId(groupId);
 	    return true;
 	}

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java

@@ -92,9 +92,8 @@ public class OrganizationsService  extends JpaService<Organizations>{
 		 return getMapper().queryOrgs(organization);
 	 }
 	 
-	 @Override
 	 public boolean delete(Organizations organization) {
-	     if(super.delete(organization)){
+	     if(super.delete(organization.getId())){
 	    	 provisionService.send(
                      ProvisionTopic.ORG_TOPIC, organization, ProvisionAction.DELETE_ACTION);
              return true;

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java

@@ -130,14 +130,13 @@ public class UserInfoService extends JpaService<UserInfo> {
         return false;
     }
 	
-    @Override
 	public boolean delete(UserInfo userInfo) {
 	    UserInfo loadUserInfo = null;
 	    if(provisionService.getApplicationConfig().isProvisionSupport()) {
 	        loadUserInfo = findUserRelated(userInfo.getId());
 	    }
 	    
-		if( super.delete(userInfo)){
+		if( super.delete(userInfo.getId())){
 			provisionService.send(
 		            ProvisionTopic.USERINFO_TOPIC, 
 		            loadUserInfo, 

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java

@@ -54,7 +54,7 @@ public class FormBasedDetailsServiceTest {
 		service.insert(formBasedDetails);
 		
 		Thread.sleep(1000);
-		service.remove(formBasedDetails.getId());
+		service.delete(formBasedDetails.getId());
 		
 	}
 	
@@ -74,7 +74,7 @@ public class FormBasedDetailsServiceTest {
 		_logger.info("remove...");
 		AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails();
 		formBasedDetails.setId("921d3377-937a-4578-b1e2-92fb23b5e512");
-		service.remove(formBasedDetails.getId());
+		service.delete(formBasedDetails.getId());
 		
 	}