根据IDS查预算，商品

src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java

@@ -83,7 +83,7 @@ public class GoodsCategoryController {
      * @return
      */
     @PostMapping("/listTreeVoByParam")
-    public R<List<GoodsCategoryTreeVo>> listTreeVoBySelect(@RequestBody GoodsCategory param){
+    public R<List<GoodsCategory>> listTreeVoBySelect(@RequestBody GoodsCategory param){
         if(CollectionUtil.isEmpty(param.getSelectIds())){
             return R.ok();
         }
@@ -91,16 +91,16 @@ public class GoodsCategoryController {
         categoryWrapper.eq(GoodsCategory::getEnable,1);
         categoryWrapper.in(GoodsCategory::getId,param.getSelectIds());
         List<GoodsCategory> list = goodsCategoryService.list(categoryWrapper);
-        List<GoodsCategoryTreeVo> treeNodes = list.stream().map(cate->{
-            GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo());
-            treeNode.setId(cate.getId()+"");
-            treeNode.setParentId(cate.getParentId().toString());
-            treeNode.setCostFlag(cate.getCostFlag());
-            treeNode.setSort(cate.getSort()==null ? 0 : cate.getSort());
-            treeNode.setEnable(cate.getEnable()+"");
-            return treeNode;
-        }).collect(Collectors.toList());
-        return R.ok(treeNodes);
+//        List<GoodsCategoryTreeVo> treeNodes = list.stream().map(cate->{
+//            GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo());
+//            treeNode.setId(cate.getId()+"");
+//            treeNode.setParentId(cate.getParentId().toString());
+//            treeNode.setCostFlag(cate.getCostFlag());
+//            treeNode.setSort(cate.getSort()==null ? 0 : cate.getSort());
+//            treeNode.setEnable(cate.getEnable()+"");
+//            return treeNode;
+//        }).collect(Collectors.toList());
+        return R.ok(list);
     }
 
     /**

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -7,6 +7,7 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.ValidateTools;
 import com.qs.serve.modules.goods.entity.GoodsSku;
@@ -85,6 +86,9 @@ public class GoodsSpuController {
      */
     @PostMapping("/shelfPageByParam")
     public R<List<GoodsSpu>> shelfPageByParam(GoodsSpu param){
+        if(CollectionUtil.isEmpty(param.getSelectIds())){
+            return R.ok();
+        }
         param.setShelf(1);
         List<GoodsSpu> list = goodsSpuService.selectSpuList(param);
         return R.ok(list);

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java

@@ -27,6 +27,7 @@ import com.qs.serve.modules.tbs.entity.so.TbsBudgetSo;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -57,9 +58,6 @@ public class TbsBudgetController {
     @PreAuthorize("hasRole('tbs:budget:query')")
     public R<List<TbsBudget>> getList(TbsBudgetSo param){
         List<Long> budgetIds = tbsBudgetMapper.selectBudgetId(param);
-        if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){
-            budgetIds.addAll(param.getSelectIdList());
-        }
         if(budgetIds.size()>0){
             List<TbsBudget> list = tbsBudgetService.listByIds(budgetIds);
             return R.ok(list);
@@ -67,6 +65,23 @@ public class TbsBudgetController {
         return R.ok();
     }
 
+    /**
+     * 列表（通过IDS查询）
+     * @apiNote 用于加载模板选中的预算
+     * @param param
+     * @return
+     */
+    @PostMapping("/listByIds")
+    @PreAuthorize("hasRole('tbs:budget:query')")
+    public R<List<TbsBudget>> getListByParam(@RequestBody TbsBudgetSo param){
+        if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){
+           List<TbsBudget> list = tbsBudgetService.listByIds(param.getSelectIdList());
+           return R.ok(list);
+        }else{
+            return R.ok();
+        }
+    }
+
     /**
      * 翻页
      * @param param
@@ -76,9 +91,6 @@ public class TbsBudgetController {
     @PreAuthorize("hasRole('tbs:budget:query')")
     public R<PageVo<TbsBudgetVo>> getPage(TbsBudgetSo param){
         List<Long> budgetIds = tbsBudgetMapper.selectBudgetId(param);
-        if(param.getSelectIdList()!=null && param.getSelectIdList().size()>0){
-            budgetIds.addAll(param.getSelectIdList());
-        }
         if(budgetIds.size()>0){
             PageUtil.startPage();
             LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();

src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java

@@ -26,6 +26,8 @@ public class TbsBudgetSo implements Serializable {
 
     private List<Long> selectIdList;
 
+    private Integer budgetState;
+
     /** 预算编码 */
     private String budgetCode;
 

src/main/resources/mapper/tbs/TbsBudgetMapper.xml

@@ -73,6 +73,7 @@
         FROM `tbs_budget` `tbs_budget`
         LEFT JOIN `tbs_budget_condition` `tbs_budget_condition` ON `tbs_budget`.`id` = `tbs_budget_condition`.`budget_id`
         <where>
+            <if test="query.budgetState !=null "> and `tbs_budget`.`budget_state` = #{query.budgetState}</if>
             <if test="query.budgetCode != null and query.budgetCode != ''"> and `tbs_budget`.`budget_code` like concat('%',#{query.budgetCode},'%')</if>
             <if test="query.subjectValue != null and query.subjectValue != ''">
                 and (