1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -336,7 +336,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         //费用分配列表 查看不显示已驳回和分配已完成的数据
         List<ExpenseAllocationInfo> expenseAllocationInfos = expenseAllocationInfoService.selectList(new EntityWrapper<ExpenseAllocationInfo>()
                 .eq("info_id", id)
-                .ne("status", "已驳回").or()
+                .ne("status", "已驳回")
                 .ne("complete_flag","1"));
         if (!CollectionUtils.isEmpty(expenseAllocationInfos)) {
             expenseInfo.setExpenseAllocationInfoList(expenseAllocationInfos);
@@ -989,6 +989,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 for (ExpenseAllocationInfo expenseAllocationInfo : expenseAllocationInfos) {
                     expenseAllocationInfo.setStatusFlag(StatusEnum.REJECTED.getFlag());
                     expenseAllocationInfo.setStatus(StatusEnum.REJECTED.getName());
+                    expenseAllocationInfo.setCompleteFlag("1");
                     expenseAllocationInfoService.updateById(expenseAllocationInfo);
                 }
             }