From fc0806488a3e7b3b58c1edbd988ff73797a2625f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 15:20:08 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
index 4101977..b8e6fed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
@@ -75,6 +75,7 @@
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
+
/**
* 删除事件
* */
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
index ad9498a..73245ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -188,7 +188,7 @@
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
vo.setName("社区调解站");
}else if(i==1){
- vo.setName("三说话会堂");
+ vo.setName("三说会堂");
}
list.add(vo);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml
index 4849130..f1632eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml
@@ -27,12 +27,12 @@
<select id="pageIndustryCenter"
resultType="com.panzhihua.common.model.vos.sanshuo.ComSanShuoIndustryCenterVO">
<include refid="Base_Column_List"/>
- <where>
+ where del_flag=1
<if test="keyWord != null and keyWord != ''">
- name like concat('%',#{keyWord},'%')
+ AND name like concat('%',#{keyWord},'%')
OR phone like concat('%',#{keyWord},'%')
</if>
- </where>
+
</select>
<select id="indstryList" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertRangeVO">
--
Gitblit v1.7.1