|
|
|
@ -58,7 +58,8 @@ public class SuperviseReportService extends ServiceImpl<SuperviseReportMapper, S |
|
|
|
//查询条件
|
|
|
|
//查询条件
|
|
|
|
queryWrapper.like(StrUtil.isNotEmpty(queryParam.getReportName()),"t.report_name",queryParam.getReportName()) |
|
|
|
queryWrapper.like(StrUtil.isNotEmpty(queryParam.getReportName()),"t.report_name",queryParam.getReportName()) |
|
|
|
.like(StrUtil.isNotEmpty(queryParam.getCrtUser()),"t.crt_user",queryParam.getCrtUser()) |
|
|
|
.like(StrUtil.isNotEmpty(queryParam.getCrtUser()),"t.crt_user",queryParam.getCrtUser()) |
|
|
|
.groupBy("t.id"); |
|
|
|
.groupBy("t.id").orderByDesc("t.crt_time"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Page<SuperviseReportVo> page= baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); |
|
|
|
Page<SuperviseReportVo> page= baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); |
|
|
|
page.getRecords().forEach(s->{ |
|
|
|
page.getRecords().forEach(s->{ |
|
|
|
@ -90,7 +91,7 @@ public class SuperviseReportService extends ServiceImpl<SuperviseReportMapper, S |
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
|
|
|
|
|
|
|
|
// 权限
|
|
|
|
// 权限
|
|
|
|
if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { |
|
|
|
if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) ) { |
|
|
|
report.setCrtDepart(user.getDepartName()); |
|
|
|
report.setCrtDepart(user.getDepartName()); |
|
|
|
report.setCrtDepartId(user.getDepartId()); |
|
|
|
report.setCrtDepartId(user.getDepartId()); |
|
|
|
report.setCrtUser(user.getNickName()); |
|
|
|
report.setCrtUser(user.getNickName()); |
|
|
|
|