Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-28 fc0806488a3e7b3b58c1edbd988ff73797a2625f

Merge branch 'sanshuohuitang_dev' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java

@@ -75,6 +75,7 @@
        return commediateTypeService.addOrUpdate(comMediateTypeDTO);
    }


    /**
     * 删除事件
     * */

 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);
                }

 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">