yanghui
2022-10-27 9b87eeaa4c66ac791da8936acb8bd632257dd934
Merge branch 'local_20221024' into huacheng_test
3个文件已修改
20 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java
@@ -78,7 +78,7 @@
    @ApiModelProperty("是否注册小程序(1.是 0.否)")
    private Integer isRegister;
    @ApiModelProperty(value = "农行账号集合")
    private String[] accounts;
    @ApiModelProperty(value = "农行单位id集合")
    private Long[] ids;
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -297,8 +297,12 @@
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        //pagePartyOrganizationVO.setCommunityId(this.getCommunityId());
        String[] area={"东区","仁和区","米易县","盐边县","西区","钒钛高新区"};
        String[] accounts = {"NXPZHFXB","NXPZHBCG","NXPZHFXY","NHPZHBCG","NXPZHDFF","NXPZHXYL","NHPZHXYL","NXPZHGZP","NXPZHZSZ","NXYBZGFL","NXPZHDSJ","NXPZHPJF",
                "NXPZHJBF","NXPZHRHZ","NHPZHRHZ","NXPZHQDF","NXPZHDHZ","NXPZHYHF","NXMYXZXB","NXMYXZXY","NXMYCGFL","NXMYHXFL","NXYBXZXB","NXYBXZXY","NXYBANFL","NXYBHGFL","NXYBYMZX","NXPZHJJF"};
        Long[] ids = {1584725574201409537L,1584725574771834881L,1584725575031881730L,1584725575593918466L,
                1584725576118206466L,1584725576416002050L,1584725576667660289L,1584725576952872961L,1584725577238085633L,
                1584725577854648322L,1584725578626400258L,1584725579213602817L,1584725579867914241L,1584725580505448449L,
                1584725580815826946L,1584725581386252289L,1584725581671464962L,1584726087093485569L,1584726087433224193L,
                1584726088058175490L,1584726088880259073L,1584726089442295809L,1584726091128406018L,1584726091694637058L,
                1584726092537692162L,1584726093053591554L,1584726093779206146L,1584726094655815681L};
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(ArrayUtil.contains(area, loginUserInfo.getName())){
            pagePartyOrganizationVO.setBelongTo(loginUserInfo.getName());
@@ -311,7 +315,7 @@
            pagePartyOrganizationVO.setCheckUnitId(loginUserInfo.getBindingCheckUnitId());
        }
        if ("PZHZGNYYH".equals(loginUserInfo.getAccount())){
            pagePartyOrganizationVO.setAccounts(accounts);
            pagePartyOrganizationVO.setIds(ids);
        }
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -82,9 +82,9 @@
            <if test='dto.account != null and dto.account != &quot;&quot;'>
                and su.account like concat (#{dto.account},'%')
            </if>
            <if test="dto.accounts != null and dto.accounts.length != 0">
                and su.account IN
                <foreach collection="dto.accounts" item="item" open="(" separator="," close=")">
            <if test="dto.ids != null and dto.ids.length != 0">
                and cpcu.id IN
                <foreach collection="dto.ids" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>