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

DESKTOP-71BH0QO\L、ming

2021-05-10 b7ee93df9c0f10ce17431fd1ef33506742977b82

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

@@ -68,8 +68,7 @@
            "<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name != &quot;&quot;'>" +
            "and m.name like concat (#{pagePartyOrganizationVO.name},'%')"+
            " </if> " +

            "order by m.join_time desc "+
            "order by m.create_at desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyOrganization(Page page, @Param("pagePartyOrganizationVO") PagePartyOrganizationVO pagePartyOrganizationVO);

@@ -139,7 +138,8 @@
            "CASE\n" +
            "WHEN u.id_card IS NULL THEN\n" +
            "'未注册' ELSE '已注册' \n" +
            "END STATUS \n" +
            "END STATUS," +
            " m.create_at \n" +
            "FROM\n" +
            "com_pb_member m\n" +
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
@@ -163,7 +163,7 @@
            " left join com_act as ca on ca.community_id = cpm.community_id " +
            " left join com_pb_org as cpo on cpo.id = cpm.org_id " +
            " LEFT JOIN sys_user u ON cpm.id_card = u.id_card " +
            " where cpm.community_id = #{organizationVO.communityId} " +
            " where cpm.community_id = #{organizationVO.communityId} and cpm.audit_result = 1 " +
            "<if test='organizationVO.orgName != null'>" +
            " and cpo.name LIKE CONCAT('%',#{organizationVO.orgName},'%') "+
            " </if> " +