Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 5d566e491ab9510c57a5f64885d273c2d6948ffe

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java

@@ -59,6 +59,7 @@
                .eq(PartyMember::getDelFlag, 0));

        PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
        partyCardInfoVO.setAvatar(partyMember.getAvatar());
        partyCardInfoVO.setName(partyMember.getName());
        partyCardInfoVO.setIdCard(partyMember.getIdNumber());
        partyCardInfoVO.setDistricts(partyMember.getDistricts());
@@ -129,7 +130,7 @@
        Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
        List<PermissionsVO> permissions = new ArrayList<>();
        IdentityInformationVO identityInformationVO = new IdentityInformationVO();
        identityInformationVO.setIsConfirmContent(isConfirm == 1);
        identityInformationVO.setIsConfirmContent(isConfirm !=null && isConfirm == 1);
        if (partyMember != null) {
            identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
        }
@@ -140,9 +141,25 @@
        if (identity == null && systemUser != null) {
            identityInformationVO.setIdentity(2);
            redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
        } else {
        }else if (identity == null && partyMember != null){
            identityInformationVO.setIdentity(1);
            redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
        }
        else {
            identityInformationVO.setIdentity(identity);
        }

        if (identityInformationVO.getIdentity() != null){
            if (identityInformationVO.getIdentity() == 1){
                identityInformationVO.setIsFrozen(partyMember !=null && partyMember.getFreezeStatus() == 1);
            }else if (identityInformationVO.getIdentity() == 2){
                identityInformationVO.setIsFrozen(systemUser != null &&systemUser.getStatus() == 2);
            }
        }else {
            identityInformationVO.setIsFrozen(false);
        }



        identityInformationVO.setIsPartymember(partyMember != null && partyMember.getAuditStatus().equals(1));
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
@@ -165,10 +182,12 @@
            if (accountLevel == 1){
                adminPermissions.setName(String.format("%s%s%s%s%s", "攀枝花市",districts, street, community, "管理员"));
            }if (accountLevel == 2) {
                adminPermissions.setIdentity(2);
                adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
            } else if (accountLevel == 3) {
                adminPermissions.setIdentity(2);
                adminPermissions.setName(String.format("%s%s%s",  street, community, "管理员"));
            } else if (accountLevel == 4) {
                adminPermissions.setName(String.format("%s%s",   community, "管理员"));
                adminPermissions.setIdentity(2);
            }
            permissions.add(adminPermissions);