|
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.ruoyi.common.datascope.annotation.DataScope;
|
|
|
+import com.ruoyi.common.datascope.context.DataScopeContextHolder;
|
|
|
import com.usky.common.core.bean.CommonPage;
|
|
|
import com.usky.common.core.exception.BusinessException;
|
|
|
import com.usky.common.security.utils.SecurityUtils;
|
|
@@ -61,11 +63,13 @@ public class EgRecordServiceImpl extends AbstractCrudService<EgRecordMapper, EgR
|
|
|
|
|
|
egRecord.setCreateTime(LocalDateTime.now());
|
|
|
egRecord.setTenantId(tenantId);
|
|
|
+ egRecord.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().intValue());
|
|
|
|
|
|
this.save(egRecord);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @DataScope
|
|
|
public CommonPage<EgRecord> page(EgRecordRequestVO requestVO){
|
|
|
IPage<EgRecord> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
|
|
|
String deviceName = requestVO.getDeviceName();
|
|
@@ -86,11 +90,14 @@ public class EgRecordServiceImpl extends AbstractCrudService<EgRecordMapper, EgR
|
|
|
egDeviceList = egDeviceMapper.selectList(egDeviceQuery);
|
|
|
}
|
|
|
|
|
|
+ String dataScopeSql = DataScopeContextHolder.getDataScopeSql();
|
|
|
+
|
|
|
LambdaQueryWrapper<EgRecord> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.like(StringUtils.isNotBlank(requestVO.getUserName()),EgRecord::getUserName,requestVO.getUserName())
|
|
|
.eq(null != requestVO.getPassType(),EgRecord::getPassType,requestVO.getPassType())
|
|
|
.in(CollectionUtils.isNotEmpty(egDeviceIdList),EgRecord::getEgDeviceId,egDeviceIdList)
|
|
|
.between(StringUtils.isNotBlank(requestVO.getStartTime())&&StringUtils.isNotBlank(requestVO.getEndTime()),EgRecord::getPassTime,requestVO.getStartTime(),requestVO.getEndTime())
|
|
|
+ .apply(Objects.nonNull(dataScopeSql), dataScopeSql)
|
|
|
.orderByDesc(EgRecord::getId);
|
|
|
page = this.page(page,queryWrapper);
|
|
|
if((page.getRecords().size() > 0) && (egDeviceList.size() > 0)){
|