bug修改

luofl

2025-03-18 0df5505f512752a96553fceafea6bc206d28ca74

bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/ServiceDlzApplication.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/controller/CommonController.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -1061,6 +1061,7 @@

    /**
     * 诉求列表导出
     *
     * @param query
     * @param loginUserInfo
     */
@@ -1203,6 +1204,7 @@
    
    /**
     * 获取超时未评价的数据
     *
     * @return
     */
    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java

@@ -22,6 +22,7 @@
    private final ISystemUserService systemUserService;
    private final IPartyMemberService partyMemberService;
    private final RedisUtils redisUtils;

    @Override
    public IdentityInformation getIdentityInformation(LoginUserInfoVO loginUserInfo) {
        // 获取党员信息
@@ -55,8 +56,7 @@
        }else if (identity == null && partyMember != null){
            identityInformationVO.setIdentity(1);
            redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
        }
        else {
        } else {
            identityInformationVO.setIdentity(identity);
        }

@@ -74,13 +74,7 @@
        identityInformationVO.setIsPartymember(partyMember != null && partyMember.getAuditStatus().equals(1));
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
        if (partyMember != null) {
            PermissionsVO partyMemberPermissions = new PermissionsVO();
            partyMemberPermissions.setIdentity(1);
            partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
            partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
            permissions.add(partyMemberPermissions);
        }

        if (systemUser != null) {
            Integer accountLevel = systemUser.getAccountLevel();
            String districts = systemUser.getDistricts();
@@ -91,18 +85,25 @@
            adminPermissions.setIsFrozen(systemUser.getStatus() == 2);
            if (accountLevel == 1) {
                adminPermissions.setName(String.format("%s%s", "攀枝花市", "管理员"));
            }
            if (accountLevel == 2) {
            } else if (accountLevel == 2) {
                adminPermissions.setName(String.format("%s%s", districts, "管理员"));
            } else if (accountLevel == 3) {
                adminPermissions.setIdentity(2);
                adminPermissions.setName(String.format("%s%s%s", districts, street, "管理员"));
            } else if (accountLevel == 4) {
                adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
                adminPermissions.setIdentity(2);
            } else {
                adminPermissions.setName("未知");
            }
            permissions.add(adminPermissions);
        }

        if (partyMember != null) {
            PermissionsVO partyMemberPermissions = new PermissionsVO();
            partyMemberPermissions.setIdentity(1);
            partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
            partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
            permissions.add(partyMemberPermissions);
        }
        identityInformationVO.setPermissions(permissions);
        return identityInformationVO;
    }