Skip to content

Z
zlmy-cloud
Commit 83c0f224 authored by 鲁鸿波's avatar 鲁鸿波
Browse files
Options

Merge branch 'dev_2.6.0' of http://120.46.174.3:8099/zlmy/zlmy-cloud into dev_2.6.0

parents 17d4e54c a5270418
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/duty/service/impl/DutyServiceImpl.java
View file @ 83c0f224
...@@ -1381,6 +1381,7 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D ...@@ -1381,6 +1381,7 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
wrapper.in("company_id", list); wrapper.in("company_id", list);
} }
wrapper.eq("duty_date", format); wrapper.eq("duty_date", format);
wrapper.ne("status", BizConstants.STATUS_DELETE);
List<TSysDuty> list = this.list(wrapper); List<TSysDuty> list = this.list(wrapper);
List<TSysDuty> resultList = new ArrayList<>(); List<TSysDuty> resultList = new ArrayList<>();
for (TSysDuty tSysDuty : list) { for (TSysDuty tSysDuty : list) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment