From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
index 03111c9..a7923f8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -21,17 +21,17 @@
@Select("<script>"
+ "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`,"
- + "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c" + " <where>"
- + "c.delete_status=1 and c.status = 1"
+ + "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c " + " <where>"
+ + "c.delete_status=1 and c.status = 1 "
+ "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>"
- + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" + " </if> "
+ + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') " + " </if> "
+ "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != ""'>"
- + "and c.store_account = #{pageComShopStoreDTO.account} \n" + " </if> "
+ + "and c.store_account = #{pageComShopStoreDTO.account} " + " </if> "
+ "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != ""'>"
- + "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') \n" + " </if> "
+ + "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') " + " </if> "
+ "<if test='pageComShopStoreDTO.deliveryType != null'>"
- + "and c.delivery_type =#{pageComShopStoreDTO.deliveryType}\n" + " </if> "
- + "<if test='pageComShopStoreDTO.status != null'>" + "and c.status =#{pageComShopStoreDTO.status} \n"
+ + "and c.delivery_type =#{pageComShopStoreDTO.deliveryType} " + " </if> "
+ + "<if test='pageComShopStoreDTO.status != null'>" + "and c.status =#{pageComShopStoreDTO.status} "
+ " </if> " + " </where>" + " order by c.create_at desc" + "</script>")
IPage<PageShopStoreVO> pageShopStore(Page page,
@Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
--
Gitblit v1.7.1