Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-19 ceba89443dc0f8240e5bebb0d6f708eb6947c9e7

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -88,6 +88,7 @@
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
    }


    /**
     * 删除
     * */

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -172,9 +172,9 @@
                }
            }
        }
        if (loginUserInfo.getAccount().equals("admin") || loginUserInfo.getAccount().equals("xiqu")){
        if (loginUserInfo.getAccount().equals("admin") && isNull(level)){
            id=null;
            range=null;
            range=1;
        }
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
        for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml

@@ -53,6 +53,9 @@
                OR name like concat('%',#{keyWord},'%')
                OR phone like concat('%',#{keyWord},'%')
            </if>
            <if test="level != null ">
            AND level=#{level}
            </if>
            <if test="range != null and range != ''">
                <if test="range == 3">
                  AND street_id=#{id}
@@ -63,10 +66,11 @@
                <if test="range == 2">
                  AND industry_center_id=#{id}
                </if>
                <if test="range == 1">
                    AND level=1
                </if>
            </if>
            <if test="level != null ">
                AND level=#{level}
            </if>

    </select>
    <select id="selectExpertIndustry" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.id from com_sanshuo_expert t