peihaoyu/linfeng-community
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/virus010101/linfeng-community

Browse Source
This commit is contained in:
linfeng 2023-06-19 12:47:11 +08:00
commit 275e0b2253
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/io/linfeng/modules/sys/controller/SysConfigController.java
View File

@ -1,4 +1,3 @@
package io.linfeng.modules.sys.controller; package io.linfeng.modules.sys.controller;

5
src/main/java/io/linfeng/modules/sys/controller/SysMenuController.java
View File

@ -63,8 +63,6 @@ public class SysMenuController extends AbstractController {
} }
} }
return menuList; return menuList;
} }
@ -140,9 +138,6 @@ public class SysMenuController extends AbstractController {
@PostMapping("/delete/{menuId}") @PostMapping("/delete/{menuId}")
@RequiresPermissions("sys:menu:delete") @RequiresPermissions("sys:menu:delete")
public R delete(@PathVariable("menuId") long menuId){ public R delete(@PathVariable("menuId") long menuId){
// if(menuId <= 31){
// return R.error("系统菜单，不能删除");
// }
//判断是否有子菜单或按钮 //判断是否有子菜单或按钮
List<SysMenuEntity> menuList = sysMenuService.queryListParentId(menuId); List<SysMenuEntity> menuList = sysMenuService.queryListParentId(menuId);

7
src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
View File

@ -89,8 +89,7 @@
if (this.pageCurrent == 0) { if (this.pageCurrent == 0) {
this.page++; this.page++;
this.getPostList() this.getPostList()
} } else if (this.pageCurrent == 1) {
if (this.pageCurrent == 1) {
this.userList = []; this.userList = [];
this.getUserRanking(); this.getUserRanking();
} }
@ -162,7 +161,7 @@
this.loadPostStatus = 'loadmore'; this.loadPostStatus = 'loadmore';
} }
}); });
}, }
} }
} }
</script> </script>
@ -246,4 +245,4 @@
margin: 30rpx 0; margin: 30rpx 0;
} }
} }
</style> </style>