From d3fd4789d1051d5910cc37b8797cf1f1ec2f712c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 9 Jul 2022 01:19:40 +0800
Subject: [PATCH] bug

---
 .../src/main/java/com/xm/core/service/XmGroupService.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
index d6a0d9e9..2cf95e6b 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
@@ -1,8 +1,10 @@
 package com.xm.core.service;
 
 import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.Page;
 import com.mdp.core.entity.Tips;
 import com.mdp.core.service.BaseService;
+import com.mdp.mybatis.PageUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.*;
@@ -92,6 +94,8 @@ public class XmGroupService extends BaseService {
 			
 		    XmGroup group = new XmGroup();
 		    group.setProjectId(projectId);
+			Page page=PageUtils.getLocalPage();
+			PageUtils.clearPage();
 		    List<XmGroup> groupList = this.selectListByWhere(group);
 		     if(groupList==null || groupList.size()==0) {
 		    	 groupCacheService.putProjectGroups(projectId, groupVoList);
@@ -115,6 +119,10 @@ public class XmGroupService extends BaseService {
 	            groupVoList.add(gvo);
 	        });
 		    groupCacheService.putProjectGroups(projectId, groupVoList);
+		    if(page.getPageNum()>0||page.getPageSize()>0){
+				PageUtils.startPage(page.getPageNum(), page.getPageSize(),page.getOrderBy());
+			}
+
 		    return groupVoList;
 		}else {
 			return groupVoList2;