bug修改

mitao

2025-02-28 7099b4be545855c3f3e5ea032494a13c45c10b84

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

@@ -405,7 +405,7 @@
        complaintAuditRecord2.setReportType(reportType);
        complaintAuditRecord2.setSuperiorId(superiorId);
        complaintAuditRecord2.setComment(dto.getComment());
        complaintAuditRecord.setSort(count + 2);
        complaintAuditRecord2.setSort(count + 2);
        complaintAuditRecordService.save(complaintAuditRecord2);
    }

@@ -596,7 +596,7 @@
            if (accountLevel == 1) {
                throw new ServiceException("市级账号,无法上报！");
            }
            reportType = accountLevel + 1;
            reportType = accountLevel - 1;

            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -630,13 +630,13 @@
        record1.setComplaintId(complaint.getId());
        record1.setLatestFlag(true);
        record1.setAuditType(2);
        record1.setAuditStatus(2);
        record1.setAuditStatus(0);
        record1.setCreateBy(loginUserInfoVO.getUserId());
        record1.setCreateTime(new Date(System.currentTimeMillis()));
        record1.setUpdateBy(loginUserInfoVO.getUserId());
        record1.setUpdateTime(new Date(System.currentTimeMillis()));
        record1.setReporter(loginUserInfoVO.getNickName());
        record1.setReportType(systemUser.getAccountLevel());
        record1.setReportType(Objects.isNull(systemUser) ? 5 : systemUser.getAccountLevel());
        record1.setSuperiorId(currentId);
        record1.setSort(count + 1);
        complaintAuditRecordService.save(record1);
@@ -645,13 +645,13 @@
        record2.setComplaintId(complaint.getId());
        record2.setLatestFlag(true);
        record2.setAuditType(2);
        record2.setAuditStatus(2);
        record2.setAuditStatus(0);
        record2.setCreateBy(loginUserInfoVO.getUserId());
        record2.setCreateTime(new Date(System.currentTimeMillis()));
        record2.setUpdateBy(loginUserInfoVO.getUserId());
        record2.setUpdateTime(new Date(System.currentTimeMillis()));
        record2.setReporter(loginUserInfoVO.getNickName());
        record2.setReportType(systemUser.getAccountLevel() - 1);
        record2.setReportType(reportType);
        record2.setSuperiorId(superiorId);
        record2.setSort(count + 2);
        complaintAuditRecordService.save(record2);
@@ -743,7 +743,8 @@
        // 使用基本类型比较并补充默认分支
        List<DispatchVO> dispatchVOList = new ArrayList<>();
        if (accountLevel == ReportTypeEnum.STREET.getCode()) {
            List<ComAct> list = comActService.list();
            String streetId = adminUser.getStreetId();
            List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
            for (ComAct comAct : list) {
                DispatchVO dispatchVO = new DispatchVO();
                dispatchVO.setId(comAct.getCommunityId().toString());
@@ -751,7 +752,8 @@
                dispatchVOList.add(dispatchVO);
            }
        } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
            List<ComStreet> list = comStreetService.list();
            String districtsCode = adminUser.getDistrictsCode();
            List<ComStreet> list = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, districtsCode));
            for (ComStreet street : list) {
                DispatchVO dispatchVO = new DispatchVO();
                dispatchVO.setId(street.getStreetId().toString());