From 89c6943973621c6dfc23844999245cc35ee477b4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index c2b8aad..9d89da3 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -23,6 +23,7 @@
 import com.moral.api.service.ManageAccountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.service.ManageMenuService;
 import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.util.*;
@@ -50,7 +51,7 @@
     @Autowired
     ManageRoleMapper manageRoleMapper;
     @Autowired
-    ManageMenuMapper manageMenuMapper;
+    ManageMenuService manageMenuService;
     @Autowired
     ManageAccountRoleMapper manageAccountRoleMapper;
 
@@ -104,7 +105,7 @@
         //������������
         List<ManageMenu> menus = null;
         if (!ObjectUtils.isEmpty(roles)) {
-            menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
+            menus = manageMenuService.getParentChildrenMenusByRoles(roles);
         }
 
         //������������������

--
Gitblit v1.8.0