Browse Source

后台登录

523096025 2 years ago
parent
commit
c294c5470d

+ 26 - 3
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/AuthorizeServiceImpl.java

@@ -91,9 +91,9 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
 
 
 
 
 
 
-    @Override
+ /*   @Override
     public Result getMenuByGroup(String groupId) {
     public Result getMenuByGroup(String groupId) {
-        /* 根据权限组读取已关联菜单 */
+        *//* 根据权限组读取已关联菜单 *//*
         QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
         QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
         groupMenuQueryWrapper.eq("group_id",groupId);
         groupMenuQueryWrapper.eq("group_id",groupId);
 
 
@@ -101,7 +101,7 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
         if (groupMenuEntityList.size() == 0) {
         if (groupMenuEntityList.size() == 0) {
             return new Result(10005, "当前权限组暂未关联任何菜单.", false);
             return new Result(10005, "当前权限组暂未关联任何菜单.", false);
         }
         }
-        /* 读取所有菜单 */
+        *//* 读取所有菜单 *//*
         List<Menu> allMenuList = menuMapper.selectList(null);
         List<Menu> allMenuList = menuMapper.selectList(null);
         if (allMenuList.size() == 0) {
         if (allMenuList.size() == 0) {
             return new Result(10007, "当前无任何菜单.", false);
             return new Result(10007, "当前无任何菜单.", false);
@@ -149,6 +149,29 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
 //        }
 //        }
         return new Result(ResultCode.SUCCESS, idSb2.toString());
         return new Result(ResultCode.SUCCESS, idSb2.toString());
     }
     }
+*/
+    @Override
+    public Result getMenuByGroup(String groupId) {
+        QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+        groupMenuQueryWrapper.eq("group_id",groupId);
+        groupMenuQueryWrapper.eq("is_all",0);
+        List<GroupMenu> groupMenuEntityList = groupMenuMapper.selectList(groupMenuQueryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
+        }
+        StringBuilder stringBuffer = new StringBuilder();
+
+        for (GroupMenu groupMenu : groupMenuEntityList) {
+
+            stringBuffer.append(groupMenu.getMenuId());
+            stringBuffer.append(",");
+
+        }
+        stringBuffer.deleteCharAt(stringBuffer.length()-1);
+
+
+        return new Result(ResultCode.SUCCESS, stringBuffer.toString());
+    }
 
 
     /**
     /**
      * @param accountId
      * @param accountId

+ 1 - 1
admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/MenuMapper.xml

@@ -18,7 +18,7 @@
         WHERE id IN
         WHERE id IN
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
         (SELECT group_id FROM sys_account_group WHERE
         (SELECT group_id FROM sys_account_group WHERE
-        account_id=#{userId})) and weight =1
+        account_id=#{userId})) and weight =2
         ORDER BY sort ASC
         ORDER BY sort ASC
     </select>
     </select>
 </mapper>
 </mapper>