Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java

@@ -36,7 +36,7 @@
        + "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>"
        + " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " + " </if> "
        + "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>"
        + " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + " and t.community_id = ${pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + "</script>")
    IPage<ComMngRealCompanyVO> pageQueryComMngRealCompany(Page page,
        @Param(value = "pageComMngRealCompanyDTO") PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
@@ -47,7 +47,7 @@
        + "<if test='exportRealCompanyExcelDTO.comName != null and exportRealCompanyExcelDTO.comName.trim() != &quot;&quot;'>"
        + " and t.com_name LIKE concat( #{exportRealCompanyExcelDTO.comName}, '%' )  " + " </if> "
        + "<if test='exportRealCompanyExcelDTO.communityId != null and exportRealCompanyExcelDTO.communityId != 0'>"
        + " and t.community_id = #{exportRealCompanyExcelDTO.communityId} " + " </if> "
        + " and t.community_id = ${exportRealCompanyExcelDTO.communityId} " + " </if> "
        + "<if test='exportRealCompanyExcelDTO.legalPerson != null and exportRealCompanyExcelDTO.legalPerson.trim() != &quot;&quot;'>"
        + " and t.legal_person LIKE concat( #{exportRealCompanyExcelDTO.legalPerson}, '%' )  " + " </if> "
        + " order by t.create_at desc" + "</script>")
@@ -69,6 +69,6 @@
    ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(
        @Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);

    @Select("select count(id) as companyTotal from com_mng_real_company where community_id = #{communityId}")
    @Select("select count(id) as companyTotal from com_mng_real_company where community_id = ${communityId}")
    ComMngRealCompanyTotalVO getComMngRealCompanyTotalByAdmin(@Param("communityId") Long communityId);
}