基因定制、样本送检列表查询根据审核人查询

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -95,7 +95,18 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
                 .in(!vo.getStatusList().isEmpty(), FlowInfo::getStatus, vo.getStatusList())
                 .eq(FlowInfo::getDeleted, YesNoEnum.NO.getCode())
                 .orderByDesc(FlowInfo::getCreateTime);
-        Page<FlowInfo> page = baseMapper.selectPageByScope(pageQuery, lqw, DataScope.of());
+
+        DataScope dataScope = DataScope.of();
+        //选择了审核状态，则只能看到自己审核的
+        if (GeneStatusEnum.PROJECT_LEADER.getStatus().equals(vo.getStatusList().get(0))) {
+            lqw.eq(FlowInfo::getProjectLeaderId, UserUtil.getUserId());
+            dataScope = null;
+        } else if (GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(vo.getStatusList().get(0))) {
+            lqw.eq(FlowInfo::getProjectManageId, UserUtil.getUserId());
+            dataScope = null;
+        }
+
+        Page<FlowInfo> page = baseMapper.selectPageByScope(pageQuery, lqw, dataScope);
         if (page.getTotal() < 1) {
             return new Page<>();
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -195,7 +195,17 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             wrapper.and(i -> i.like(SampleInfo::getProjectNo, vo.getProject()).or()
                     .like(SampleInfo::getProjectName, vo.getProject()));
         }
-        Page<SampleInfo> page = baseMapper.selectPageByScope(pageQuery, wrapper, DataScope.of());
+        DataScope dataScope = DataScope.of();
+        //选择了审核状态，则只能看到自己审核的
+        if (GeneStatusEnum.DEPART_LEADER.getStatus().equals(vo.getStatus())) {
+            wrapper.eq(SampleInfo::getDepartLeaderId, UserUtil.getUserId());
+            dataScope = null;
+        } else if (GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(vo.getStatus())) {
+            wrapper.eq(SampleInfo::getProjectManageId, UserUtil.getUserId());
+            dataScope = null;
+        }
+
+        Page<SampleInfo> page = baseMapper.selectPageByScope(pageQuery, wrapper, dataScope);
 
         Page<SamplePageDto> pageResult = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
         if (page.getTotal() < 1) {