From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 f2b9d6a..fb953d7 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
@@ -19,13 +19,15 @@
public interface ComShopStoreDAO extends BaseMapper<ComShopStoreDO> {
@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 from com_shop_store c" +
+ "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
+ "sale,sale_volume,store_detail,create_at from com_shop_store c" +
" <where>" +
+ "c.delete_status=1" +
"<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" +
"and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
" </if> " +
"<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != ""'>" +
- "and c.account = #{pageComShopStoreDTO.account} \n" +
+ "and c.store_account = #{pageComShopStoreDTO.account} \n" +
" </if> " +
"<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != ""'>" +
"and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') \n" +
@@ -37,7 +39,7 @@
"and c.status =#{pageComShopStoreDTO.status} \n" +
" </if> " +
" </where>" +
- " order by c.create_at desc"+
+ " order by c.create_at desc" +
"</script>")
IPage<PageShopStoreVO> pageShopStore(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
--
Gitblit v1.7.1