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

huanghongfa

2021-05-08 66f5c4da0bf46869223ccf992a10313df50c95a4

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

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -508,6 +508,7 @@
    @ApiOperation(value = "分页查询单位管理列表", response = ComMngRealCompanyVO.class)
    @PostMapping("/company/page")
    public R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO) {
        pageComMngRealCompanyDTO.setCommunityId(this.getCommunityId());
        return communityService.pageQueryComMngRealCompany(pageComMngRealCompanyDTO);
    }

@@ -620,6 +621,7 @@
    @ApiOperation(value = "分页查询实有资产列表", response = ComMngRealAssetsVO.class)
    @PostMapping("/assets/page")
    public R pageQueryComMngRealAssets(@RequestBody PageComMngRealAssetsDTO pageComMngRealAssetsDTO) {
        pageComMngRealAssetsDTO.setCommunityId(this.getCommunityId());
        return communityService.pageQueryComMngRealAssets(pageComMngRealAssetsDTO);
    }


 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);