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

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/duty/service/impl/DutyServiceImpl.java

@@ -1381,6 +1381,7 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
             wrapper.in("company_id", list);
         }
         wrapper.eq("duty_date", format);
+        wrapper.ne("status", BizConstants.STATUS_DELETE);
         List<TSysDuty> list = this.list(wrapper);
         List<TSysDuty> resultList = new ArrayList<>();
         for (TSysDuty tSysDuty : list) {