diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
index 71e36e15..cf5cddc0 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
@@ -208,11 +208,14 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
.filter(item -> containsKeyword(item, keyWord))
.collect(Collectors.toList());
}
- if (taskStatus != null) {
- list = list.stream()
- .filter(item -> item.getTaskStatus().equals(taskStatus))
- .collect(Collectors.toList());
+ if(leaseApplyInfo.getIsApp()==null){
+ if (taskStatus != null) {
+ list = list.stream()
+ .filter(item -> item.getTaskStatus().equals(taskStatus))
+ .collect(Collectors.toList());
+ }
}
+
}
return list;
}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
index 8cdc578f..de71797c 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
@@ -448,8 +448,8 @@
and lai.cost_bearing_party =
#{costBearingParty}
- and (tt.task_status = 0 or tt.task_status = 1 or tt.task_status = 2)
- and (tt.task_status = 3 or tt.task_status = 4)
+ and (tt.task_status = 0 or tt.task_status = 6)
+ and (tt.task_status = 1 )
GROUP BY lai.id
ORDER BY tt.task_status,tt.create_time desc