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

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

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

@@ -18,6 +18,7 @@

import javax.annotation.Resource;
import java.util.Date;
import java.util.Objects;

/**
 * <p>
@@ -35,6 +36,7 @@
    private final IComStreetService comStreetService;
    private final IComActService comActService;
    private final UserService userService;
    private final IPartyMemberService partyMemberService;

    @Override
    public void createFlow(ComplaintAuditRecord record, Integer type,Long userId) {
@@ -51,7 +53,7 @@
    }

    private String getFlowName(Integer reportType, Long superiorId) {
        String name;
        String name = "";
        if (reportType == ReportTypeEnum.COMMUNITY.getCode()) {
            ComAct byId = comActService.getById(superiorId);
            name = byId.getName();
@@ -63,11 +65,15 @@
                    .eq(BcRegion::getRegionCode, superiorId));
            name = bcRegion.getRegionName();
        } else {
            R<LoginUserInfoVO> userR = userService.getUserInfoByUserId(String.valueOf(superiorId));
            if (!R.isOk(userR)) {
                throw new ServiceException("获取用户信息失败");
//            R<LoginUserInfoVO> userR = userService.getUserInfoByUserId(String.valueOf(superiorId));
//            if (!R.isOk(userR)) {
//                throw new ServiceException("获取用户信息失败");
//            }
//            name =  null == userR.getData() ? "" : userR.getData().getNickName();
            PartyMember partyMember = partyMemberService.getById(superiorId);
            if (Objects.nonNull(partyMember)) {
                name = partyMember.getName();
            }
            name =  null == userR.getData() ? "" : userR.getData().getNickName();
        }
        return name;
    }