Prechádzať zdrojové kódy

1、优化门禁_通行记录表-列表接口,增加数据权限刷选,测试接口;
2、优化门禁_通行记录表-新增接口,增加部门Id值的录入,测试接口;

james 1 mesiac pred
rodič
commit
7fe7d5e02c

+ 7 - 0
service-eg/service-eg-biz/src/main/java/com/usky/eg/service/impl/EgRecordServiceImpl.java

@@ -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)){