Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -23,7 +23,7 @@
public interface ComPbServiceTeamDAO extends BaseMapper<ComPbServiceTeamDO> {

    @Select("<script> " + "SELECT\n" + "* \n" + "FROM\n" + "com_pb_service_team \n"
        + " where community_id=#{pageComPbServiceTeamDTO.communityId}"
        + " 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.job != null and pageComPbServiceTeamDTO.job.trim() != &quot;&quot;'>"
@@ -35,7 +35,7 @@
    ComPbServiceTeamDO selectComPbServiceTeamById(@Param("id") Long id);

    @Select("<script> " + "SELECT\n" + "* \n" + "FROM\n" + "com_pb_service_team \n"
        + " where community_id=#{communityId}" + "<if test='param != null and param != &quot;&quot;'>"
        + " 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);
}