Browse Source

基因定制列表查看调整

陈长荣 2 weeks ago
parent
commit
5f23ddde63

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

@@ -1,6 +1,7 @@
 package com.github.jfcloud.gene.flow.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -98,12 +99,14 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
 
         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;
+        if (CollUtil.isNotEmpty(vo.getStatusList())) {
+            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);