Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-11-17 a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java

@@ -26,6 +26,10 @@
        + " where community_id = ${pageComPbServiceTeamDTO.communityId}"
        + "<if test='pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name.trim() != &quot;&quot;'>"
        + " and name LIKE concat( #{pageComPbServiceTeamDTO.name}, '%' ) \n" + " </if> "
            + "<if test='pageComPbServiceTeamDTO.propertyId != null and pageComPbServiceTeamDTO.propertyId != &quot;&quot;'>"
            + " and property_id = #{pageComPbServiceTeamDTO.propertyId} </if> "
            + "<if test='pageComPbServiceTeamDTO.type != null and pageComPbServiceTeamDTO.type != &quot;&quot;'>"
            + " and type = #{pageComPbServiceTeamDTO.type} </if> "
        + "<if test='pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job.trim() != &quot;&quot;'>"
        + "AND job LIKE concat(\n" + "#{pageComPbServiceTeamDTO.job},\n" + "'%')" + " </if> " + "</script>")
    IPage<ComPbServiceTeamVO> PageComPbServiceTeamDTO(Page page,
@@ -38,4 +42,6 @@
        + " where community_id = ${communityId}" + "<if test='param != null and param != &quot;&quot;'>"
        + " and name LIKE concat( #{param}, '%' ) \n" + " </if> " + "</script>")
    List<ComPbServiceTeamVO> getTotlePerson(@Param("param") String param, @Param("communityId") Long communityId);

    IPage<ComPbServiceTeamVO> pageServiceTeamProperty(Page page, @Param("pageComPbServiceTeamDTO")PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
}