|
|
@@ -144,11 +144,14 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
|
|
|
//选择了审核状态,则只能看到自己审核的
|
|
|
for (String sta : statusList) {
|
|
|
if (GeneStatusEnum.GENE_EDITING.getStatus().equals(sta)) {
|
|
|
- lqw2.or(x -> x.eq(FlowInfo::getGeneEditPlId, UserUtil.getUserId()));
|
|
|
+ lqw2.or(x ->
|
|
|
+ x.eq(FlowInfo::getGeneEditPlId, UserUtil.getUserId()).eq(FlowInfo::getStatus, sta));
|
|
|
} else if (GeneStatusEnum.PROJECT_LEADER.getStatus().equals(sta)) {
|
|
|
- lqw2.or(x -> x.eq(FlowInfo::getProjectLeaderId, UserUtil.getUserId()));
|
|
|
+ lqw2.or(x ->
|
|
|
+ x.eq(FlowInfo::getProjectLeaderId, UserUtil.getUserId()).eq(FlowInfo::getStatus, sta));
|
|
|
} else if (GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(sta)) {
|
|
|
- lqw2.or(x -> x.eq(FlowInfo::getProjectManageId, UserUtil.getUserId()));
|
|
|
+ lqw2.or(x ->
|
|
|
+ x.eq(FlowInfo::getProjectManageId, UserUtil.getUserId()).eq(FlowInfo::getStatus, sta));
|
|
|
}
|
|
|
}
|
|
|
}
|