zoujiajian 2 лет назад
Родитель
Сommit
8fd0cf6660

+ 2 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/GoodsDon.java

@@ -17,7 +17,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "goods_don")
+@SearchBean(tables = "goods_don",
+		where = ":condition:")
 public class GoodsDon extends BaseEntity {
 
 

+ 1 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -191,6 +191,7 @@ public class CmsGoodsDonController {
     public Result<List<GoodsDon>> getAllGoodsList() {
         List<GoodsDon> goodsDons = beanSearcher.searchAll(GoodsDon.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(GoodsDon::getDeleted, true)
+                .put("condition", String.format("(special_type is null or special_type != giftCard)"))
                 .field(GoodsDon::getSpecialType, GoodsDon.SpecialType.giftCard.name()).op(Operator.NotEqual)
                 .onlySelect(GoodsDon::getId, GoodsDon::getCategory, GoodsDon::getType, GoodsDon::getTitle).build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDons);