| 
					
				 | 
			
			
				@@ -184,6 +184,8 @@ public class UserGroupServiceImpl implements UserGroupService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Long> userIds = userGroupDto.getUserIds(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<GroupUser>groupUsers=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<UserRoleEntity>userRoleEntities=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<Long> orginUserIds = userGroupDto.getOrginUserIds(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         userIds.forEach(id->{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             GroupUser user=new GroupUser(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setUserId(id); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -196,8 +198,10 @@ public class UserGroupServiceImpl implements UserGroupService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             user.setStatus(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             userRoleEntities.add(userRoleEntity); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(orginUserIds.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            userGroupMapper.deleteUserRoles(userGroupDto); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        userGroupMapper.deleteUserRoles(userGroupDto); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(userGroupDto.getDeleteFlag()==1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             userGroupMapper.batchInsertRoles(userRoleEntities); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             groupUserMapper.batchInsert(groupUsers); 
			 |