From 6e090ae7fba2c40d912e6ae02ee9bf60471882db Mon Sep 17 00:00:00 2001
From: WenG <450292408@qq.com>
Date: Sun, 6 Mar 2022 12:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=91=E5=BD=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E6=97=B6=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/department/service/impl/DepartmentServiceImpl.java | 2 +-
 .../ink/wgink/service/group/service/impl/GroupServiceImpl.java | 3 +--
 .../ink/wgink/module/menu/service/impl/MenuServiceImpl.java    | 2 +-
 .../service/position/service/impl/PositionServiceImpl.java     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
index eb607cfc..336b862a 100644
--- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
+++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
@@ -286,7 +286,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
     @Override
     public SuccessResultList<List<DepartmentDTO>> listPage(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
-        List<DepartmentDTO> departmentDTOs = list(page.getParams());
+        List<DepartmentDTO> departmentDTOs = departmentDao.list(page.getParams());
         PageInfo<DepartmentDTO> pageInfo = new PageInfo<>(departmentDTOs);
         return new SuccessResultList<>(departmentDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }
diff --git a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java b/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java
index a0a874b0..9f8d3f10 100644
--- a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java
+++ b/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java
@@ -6,7 +6,6 @@ import ink.wgink.common.base.DefaultBaseService;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.dtos.ZTreeDTO;
-import ink.wgink.pojo.dtos.department.DepartmentDTO;
 import ink.wgink.pojo.dtos.group.GroupDTO;
 import ink.wgink.pojo.pos.GroupPO;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -104,7 +103,7 @@ public class GroupServiceImpl extends DefaultBaseService implements IGroupServic
     @Override
     public SuccessResultList<List<GroupDTO>> listPage(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
-        List<GroupDTO> groupDTOs = list(page.getParams());
+        List<GroupDTO> groupDTOs = groupDao.list(page.getParams());
         PageInfo<GroupDTO> pageInfo = new PageInfo<>(groupDTOs);
         return new SuccessResultList<>(groupDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }
diff --git a/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
index 52cb22bd..74e98318 100644
--- a/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
+++ b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
@@ -104,7 +104,7 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
     @Override
     public SuccessResultList<List<MenuDTO>> listPage(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
-        List<MenuDTO> menuDTOs = list(page.getParams());
+        List<MenuDTO> menuDTOs = menuDao.list(page.getParams());
         PageInfo<MenuDTO> pageInfo = new PageInfo<>(menuDTOs);
         return new SuccessResultList<>(menuDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }
diff --git a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java
index 788bb353..b0f46eb6 100644
--- a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java
+++ b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java
@@ -103,7 +103,7 @@ public class PositionServiceImpl extends DefaultBaseService implements IPosition
     @Override
     public SuccessResultList<List<PositionDTO>> listPage(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
-        List<PositionDTO> positionDTOs = list(page.getParams());
+        List<PositionDTO> positionDTOs = positionDao.list(page.getParams());
         PageInfo<PositionDTO> pageInfo = new PageInfo<>(positionDTOs);
         return new SuccessResultList<>(positionDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
     }