24282 1 жил өмнө
parent
commit
c1f1f3f7ef

+ 1 - 1
hx-flow/src/main/java/com/fjhx/flow/entity/flow/dto/FlowExampleSelectDto.java

@@ -20,7 +20,7 @@ public class FlowExampleSelectDto extends BaseSelectDto {
     private Long flowInfoId;
 
     /**
-     * 0未发起 1进行中 2已结束
+     * 1进行中 2已结束
      */
     private Integer status;
 

+ 11 - 1
hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowExampleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.flow.service.flow.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -79,7 +80,16 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
 
     @Override
     public Page<FlowExampleVo> getHaveInitiatedPage(FlowExampleSelectDto dto) {
-        IWrapper<FlowExample> wrapper = getWrapper().eq("fe", FlowExample::getCreateUser, SecurityUtils.getUserId());
+        IWrapper<FlowExample> wrapper = getWrapper()
+                .eq("fe", FlowExample::getCreateUser, SecurityUtils.getUserId())
+                .func(ObjectUtil.isNotNull(dto.getStatus()), q -> {
+                    if (Objects.equals(1, dto.getStatus())) {
+                        q.in("fe", FlowExample::getStatus, 0, 1);
+                    } else {
+                        q.in("fe", FlowExample::getStatus, 2, 3);
+                    }
+                });
+
         return doSelectExample(dto, wrapper);
     }