diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 390da2d2..eabb0b55 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -57,6 +57,9 @@ public class TbsBudgetController { @PreAuthorize("hasRole('tbs:budget:query')") public R> getList(TbsBudgetSo param){ List budgetIds = tbsBudgetMapper.selectBudgetId(param); + if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){ + budgetIds.addAll(param.getSelectIdList()); + } if(budgetIds.size()>0){ List list = tbsBudgetService.listByIds(budgetIds); return R.ok(list); @@ -73,6 +76,9 @@ public class TbsBudgetController { @PreAuthorize("hasRole('tbs:budget:query')") public R> getPage(TbsBudgetSo param){ List budgetIds = tbsBudgetMapper.selectBudgetId(param); + if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){ + budgetIds.addAll(param.getSelectIdList()); + } if(budgetIds.size()>0){ PageUtil.startPage(); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java index 6beb84af..7e86d245 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java @@ -4,6 +4,7 @@ import java.time.LocalDate; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -23,6 +24,8 @@ import javax.validation.constraints.NotBlank; @Data public class TbsBudgetSo implements Serializable { + private List selectIdList; + /** 预算编码 */ private String budgetCode;