bug修改

mitao

2025-03-17 e347f2cde7bfe3452dd7d6ba6f5447b23ade64d5

bug修改

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

@@ -133,8 +133,14 @@
            identityInformationVO.setIsFrozen(systemUser.getStatus() == 2);
        }

        if (identity == null && systemUser != null){
            identityInformationVO.setIdentity(2);
        }else {
        identityInformationVO.setIdentity(identity);
        }

        identityInformationVO.setIsPartymember(partyMember != null);
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
        if (partyMember !=null){
            permissions.add(1);
@@ -146,6 +152,7 @@
        return R.ok(identityInformationVO);
    }


    /**
     * 切换身份
     */

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

@@ -1,8 +1,10 @@
package com.panzhihua.sangeshenbian.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
@@ -14,6 +16,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -94,6 +97,25 @@
        return R.ok();
    }

    /**
     * 确认党员信息
     */
    @GetMapping("/confirm-party-member-info")
    @ApiOperation("确认党员信息")
    public R<?> confirmPartyMemberInfo() {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        // 获取党员信息
        PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
                .eq(PartyMember::getPhone, loginUserInfo.getPhone())
                .eq(PartyMember::getDelFlag, 0));
        if (partyMember == null){
            return R.fail("请先完善党员信息");
        }
        partyMember.setIsConfirm(1);
        partyMemberService.updateById(partyMember);
        return R.ok();
    }



}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java

@@ -70,6 +70,7 @@
    private String community;

    @ApiModelProperty(value = "社区ID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty(value = "服务对象")
@@ -87,6 +88,9 @@
    @ApiModelProperty(value = "冻结状态 1:已冻结 0：正常中")
    private Integer freezeStatus;

    @ApiModelProperty(value = "是否确认党员信息")
    private Integer isConfirm;

    @ApiModelProperty(value = "拒绝理由")
    private String refuseReason;


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

@@ -112,7 +112,7 @@
        Integer accountLevel = 5;
        //获取当前身份，1=党员，2=管理员
        Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
        if (systemUserOpt.isPresent() && identity == 2) {
        if (systemUserOpt.isPresent() && null != identity && identity == 2) {
            SystemUser systemUser = systemUserOpt.get();
            accountLevel = systemUser.getAccountLevel();
            switch (accountLevel) {
@@ -201,7 +201,7 @@
        //获取当前身份，1=党员，2=管理员
        Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
        //上级
        if (systemUserByPhone.isPresent() && identity == 2) {
        if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
            SystemUser systemUser = systemUserByPhone.get();
            accountLevel = systemUser.getAccountLevel();
            switch (accountLevel) {

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java

@@ -22,6 +22,12 @@
    private Boolean isFrozen;

    /**
     * 是否确认党员信息
     */
    @ApiModelProperty(value = "是否确认党员信息")
    private Boolean isConfirm;

    /**
     * 是否认证党员信息
     */
    @ApiModelProperty(value = "是否认证党员信息")

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml

@@ -9,6 +9,7 @@
               phone,
               districts,
               districts_code,
               id_number,
               street,
               street_id,
               community,