|
@@ -1,18 +1,12 @@
|
|
|
package cn.com.taiji.duty.controller;
|
|
|
|
|
|
|
|
|
-import cn.com.taiji.duty.model.DutyAccount;
|
|
|
-import cn.com.taiji.duty.model.DutyDailyReportRecord;
|
|
|
-import cn.com.taiji.duty.model.DutyDailyReportRecordVo;
|
|
|
-import cn.com.taiji.duty.model.DutySignInRecord;
|
|
|
+import cn.com.taiji.duty.model.*;
|
|
|
import cn.com.taiji.duty.service.IDutyAccountService;
|
|
|
import cn.com.taiji.duty.service.IDutyConfigService;
|
|
|
import cn.com.taiji.duty.service.IDutyDailyReportRecordService;
|
|
|
import cn.com.taiji.duty.service.IDutyDailyReportRecordService;
|
|
|
-import cn.com.taiji.duty.utils.AjaxResult;
|
|
|
-import cn.com.taiji.duty.utils.HttpStatus;
|
|
|
-import cn.com.taiji.duty.utils.JwtUtils;
|
|
|
-import cn.com.taiji.duty.utils.TableDataInfo;
|
|
|
+import cn.com.taiji.duty.utils.*;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -27,6 +21,8 @@ import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -76,7 +72,18 @@ public class DutyDailyReportRecordController {
|
|
|
|
|
|
@ApiOperation("日志列表")
|
|
|
@PostMapping("list")
|
|
|
- public TableDataInfo list(@RequestBody DutyDailyReportRecordVo vo) {
|
|
|
+ public TableDataInfo list(HttpServletRequest request, @RequestBody DutyDailyReportRecordVo vo) {
|
|
|
+ String token = JwtUtils.getToken(request);
|
|
|
+ String username = redisTemplate.opsForValue().get(token);
|
|
|
+ DutyAccount account = accountService.findByUsername(username);
|
|
|
+ if (account != null) {
|
|
|
+ List<DutyRole> roles = account.getRoles();
|
|
|
+ List<String> stringList = roles.parallelStream().map(DutyRole::getPermissionValue).filter(Objects::nonNull).distinct().collect(Collectors.toList());
|
|
|
+ String join = StringUtils.join(stringList, ",");
|
|
|
+ if (join.contains("ZBY")) {
|
|
|
+ vo.setDeptId(account.getDept().getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
PageHelper.startPage(vo.getPageNum(), vo.getPageSize());
|
|
|
List<DutyDailyReportRecord> list = dailyReportRecordService.queryList(vo);
|
|
|
TableDataInfo rspData = new TableDataInfo();
|