From 0d5d25e4806c403d8f3e2188097359ccfa31d6dc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 17:53:23 +0800
Subject: [PATCH] 打卡数据过滤
---
src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java b/src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java
index 047b9d1..834f5ed 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/checkInRecords/service/impl/CheckInRecordsServiceImpl.java
@@ -17,16 +17,26 @@
package org.springblade.modules.checkInRecords.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
+import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.checkInRecords.dto.CheckInRecordsDTO;
import org.springblade.modules.checkInRecords.entity.CheckInRecordsEntity;
import org.springblade.modules.checkInRecords.vo.CheckInRecordsVO;
import org.springblade.modules.checkInRecords.mapper.CheckInRecordsMapper;
import org.springblade.modules.checkInRecords.service.ICheckInRecordsService;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.vo.DeptVO;
+import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 打卡记录表 服务实现类
@@ -39,9 +49,18 @@
@Override
public IPage<CheckInRecordsVO> selectCheckInRecordsPage(IPage<CheckInRecordsVO> page, CheckInRecordsVO checkInRecords) {
- return page.setRecords(baseMapper.selectCheckInRecordsPage(page, checkInRecords));
- }
+ // todo 数据过滤
+ String deptId = checkInRecords.getDeptId();
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
+ deptId = AuthUtil.getDeptId();
+ }
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ // 公共参数设置
+// CommonParamSet commonParamSet = new CommonParamSet().invoke(CheckInRecordsVO.class,checkInRecords);
+ IPage<CheckInRecordsVO> checkInRecordsVOIPage = page.setRecords(baseMapper.selectCheckInRecordsPage(page, checkInRecords, deptIdList));
+ return checkInRecordsVOIPage;
+ }
/**
@@ -51,8 +70,7 @@
* @return 打卡记录表
*/
@Override
- public CheckInRecordsDTO selectCheckInRecordsById(Integer id)
- {
+ public CheckInRecordsDTO selectCheckInRecordsById(Integer id) {
return this.baseMapper.selectCheckInRecordsById(id);
}
@@ -63,8 +81,7 @@
* @return 打卡记录表集合
*/
@Override
- public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO)
- {
+ public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO) {
return this.baseMapper.selectCheckInRecordsList(checkInRecordsDTO);
}
--
Gitblit v1.9.3