he2802 vor 2 Jahren
Ursprung
Commit
9b1867fbb8

+ 11 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -358,4 +358,15 @@ public class GoodsController extends BaseController {
         return toAjax(iGoodsService.updateGoodsRepair(bo) ? 1 : 0);
     }
 
+    @ApiOperation("查询商品普通列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:list')")
+    @GetMapping("/queryList")
+    public AjaxResult<List<GoodsVo>> queryList(GoodsQueryBo bo) {
+        bo.setStatus(new ArrayList<Integer>(){{
+            add(1);
+        }});
+        List<GoodsVo> list = iGoodsService.queryList(bo);
+        return AjaxResult.success(list);
+    }
+
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -2032,7 +2032,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
                             }else{
                                 //正文图片
-                                content =  content +"<br />" +"<p><img src=\"" + ossHost + "/" + imgUrl + "\"></p>";
+                                content =   "<br /><p><img src=\"" + ossHost + "/" + imgUrl + "\"></p><br />" + content;
                             }
                         }
                     }

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -497,6 +497,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), Goods::getCoverUrl, bo.getCoverUrl());
         lqw.eq(bo.getClassHours() != null, Goods::getClassHours, bo.getClassHours());
         lqw.eq(StrUtil.isNotBlank(bo.getStandPriceJson()), Goods::getStandPriceJson, bo.getStandPriceJson());
+        lqw.in(bo.getGoodsIds() != null, Goods::getGoodsId, bo.getGoodsIds());
         return entity2Vo(this.list(lqw));
     }
 
@@ -4702,7 +4703,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    
+
     public Goods getOneGoods(String code, Long id) {
         return getOne(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getCode, code)