Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 fe5224b371593245312f32495bf7752c837ed633

Merge branch 'local_20221024' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java

@@ -97,6 +97,9 @@
    @ApiModelProperty(value = "社区id集合")
    private List<Long> communityIds;

    @ApiModelProperty(value = "农行单位id集合")
    private Long[] ids;


}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java

@@ -77,4 +77,8 @@

    @ApiModelProperty("是否注册小程序（1.是 0.否）")
    private Integer isRegister;

    @ApiModelProperty(value = "农行单位id集合")
    private Long[] ids;

}

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

@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.common.PagePbCheckUnitCommonDto;
import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo;
@@ -82,15 +83,26 @@
    public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        //comPbCheckUnit.setCommunityId(this.getCommunityId());
        String[] area={"东区","仁和区","米易县","盐边县","西区","钒钛高新区"};
        if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){
            comPbCheckUnit.setBelongTo(this.getLoginUserInfo().getName());
        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())){
            comPbCheckUnit.setBelongTo(loginUserInfo.getName());
        }
        Long communityId = comPbCheckUnit.getCommunityId();
        if (null!= communityId && communityId == 0L){
            comPbCheckUnit.setCommunityId(null);
        }
        if(this.getLoginUserInfo().getBindingCheckUnitId()!=null){
            comPbCheckUnit.setId(this.getLoginUserInfo().getBindingCheckUnitId());
        if(loginUserInfo.getBindingCheckUnitId()!=null){
            comPbCheckUnit.setId(loginUserInfo.getBindingCheckUnitId());
        }
        //攀枝花中国农业银行
        if ("PZHZGNYYH".equals(loginUserInfo.getAccount())){
            comPbCheckUnit.setIds(ids);
        }
        return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
    }

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

@@ -297,15 +297,25 @@
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        //pagePartyOrganizationVO.setCommunityId(this.getCommunityId());
        String[] area={"东区","仁和区","米易县","盐边县","西区","钒钛高新区"};
        if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){
            pagePartyOrganizationVO.setBelongTo(this.getLoginUserInfo().getName());
        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());
        }
        Long communityId = pagePartyOrganizationVO.getCommunityId();
        if (null!= communityId && communityId == 0L){
            pagePartyOrganizationVO.setCommunityId(null);
        }
        if(this.getLoginUserInfo().getBindingCheckUnitId()!=null){
            pagePartyOrganizationVO.setCheckUnitId(this.getLoginUserInfo().getBindingCheckUnitId());
        if(loginUserInfo.getBindingCheckUnitId()!=null){
            pagePartyOrganizationVO.setCheckUnitId(loginUserInfo.getBindingCheckUnitId());
        }
        if ("PZHZGNYYH".equals(loginUserInfo.getAccount())){
            pagePartyOrganizationVO.setIds(ids);
        }
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml

@@ -42,6 +42,12 @@
                    #{item}
                </foreach>
            </if>
            <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>
            <if test="dto.keyWord != null and dto.keyWord != ''">
                and (cpcu.contacts like concat(#{dto.keyWord},'%') or cpcu.`name` like concat('%',#{dto.keyWord},'%') or cpcu.phone like concat(#{dto.keyWord},'%'))
            </if>

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -80,7 +80,13 @@
               and o.id = #{dto.orgId}
            </if>
            <if test='dto.account != null and dto.account != &quot;&quot;'>
                and m.phone like concat (#{dto.account},'%')
                and su.account like concat (#{dto.account},'%')
            </if>
            <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>
            <if test='dto.name != null and dto.name != &quot;&quot;'>
                and m.name like concat (#{dto.name},'%')