LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into xuqiubiangeng1026

Browse Source
This commit is contained in:
梁琦涛
2021-10-29 09:59:57 +08:00
parent 6ebf03cc09 7debfa7436
commit 153449783b
28 changed files with 498 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+5 -1
View File
@@ -82,7 +82,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!rolePermissionService.getRolePermission("generalProject:search")) {
if (!rolePermissionService.getRolePermission("memberProject:search")) {
payMemberProject.setDirectorId(sysUser.getId());
}
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap());
@@ -257,6 +257,10 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@RequiresPermissions("memberProject:export")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!rolePermissionService.getRolePermission("memberProject:search")) {
payMemberProject.setDirectorId(sysUser.getId());
}
QueryWrapper<PayMemberProject> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap());
List<PayMemberProject> pageList = memberProjectService.list(queryWrapper);
// 过滤选中数据