Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -1070,6 +1070,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
         Criteria criteria = Cnd.cri();
         criteria.where().andEquals("role_id", dto.getRoleId());
+        if(dto.getExcludeUserId()!=null){
+            criteria.where().andNotEquals("user_id", dto.getExcludeUserId());
+        }
 
         //分页对象
         Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());