diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java index a01317652..18d7d6200 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java @@ -191,6 +191,10 @@ public class SubjectFeeDetailController extends BladeController { if ("辅助人员材料费用".equals(subjectName)) { iterator.remove(); // 只有迭代器的 remove 才安全 } + // 如果“erp作业中心材料费用”,删除 + if ("erp作业中心材料费用".equals(subjectName)) { + iterator.remove(); // 只有迭代器的 remove 才安全 + } } } return R.data(list); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml index c47575138..3853cbb6a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml @@ -25,6 +25,7 @@ + @@ -35,6 +36,9 @@ and MONTH = #{param2.month} + + and JC_ID = #{param2.jcId} +