java/zhihuishenqu.git

			@@ -231,8 +231,11 @@
			vo.setEvaluateButtonStatus(1);
			vo.setAuditButtonStatus(1);

			ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
			.ne(ComplaintAuditRecord::getAuditType, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
			ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
			.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
			// .ne(ComplaintAuditRecord::getAuditType, 1)
			.orderByDesc(ComplaintAuditRecord::getSort)
			.last(" limit 0, 1"));
			//没有审核数据，且正在办理，则按钮权限是添加人员的
			if (null == one && (vo.getStatus() == 0 \|\| vo.getStatus() == 1 \|\| vo.getStatus() == 2)) {
			if (systemUserByPhone.isPresent()) {
			@@ -251,8 +254,10 @@
			}
			//有审核数据，且正在办理
			if (null != one && (vo.getStatus() == 0 \|\| vo.getStatus() == 1 \|\| vo.getStatus() == 2 \|\| vo.getStatus() == 6)) {


			//区分是上报数据还是下派数据
			if (one.getAuditType() == 2) {
			if (one.getAuditType() == 2 \|\| one.getAuditType() == 1) {
			//判断当前审核状态
			if (one.getAuditStatus() == 1) {
			//审核状态为通过，则权限给到上报审核的这一层
			@@ -267,8 +272,12 @@
			}
			} else {
			//没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
			ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
			.eq(ComplaintAuditRecord::getAuditType, 2).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
			ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
			.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
			.eq(ComplaintAuditRecord::getAuditType, 2)
			.eq(ComplaintAuditRecord::getAuditStatus, 1)
			.orderByDesc(ComplaintAuditRecord::getSort)
			.last(" limit 0, 1"));
			if (null != one1) {
			if (systemUserByPhone.isPresent()) {
			SystemUser systemUser = systemUserByPhone.get();
			@@ -388,7 +397,8 @@
			break;
			}

			ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
			ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
			.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
			.eq(ComplaintAuditRecord::getLatestFlag, 1));
			Integer isAdmin = systemUserByPhone.get().getIsAdmin();
			if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId) && 1 == isAdmin) {
			@@ -789,6 +799,7 @@
			SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
			Long superiorId;
			int reportType;
			String departmentName = "";
			if (identityInformation.getIdentity() == 1) {
			PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
			superiorId = partyMember.getCommunityId();
			@@ -796,6 +807,7 @@
			throw new ServiceException("延期申请失败，请绑定社区");
			}
			reportType = ReportTypeEnum.COMMUNITY.getCode();
			departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
			} else if (identityInformation.getIdentity() == 2 && systemUser != null) {
			int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
			if (accountLevel == 1) {
			@@ -815,6 +827,30 @@
			} else {
			// 处理未预期的账号等级
			throw new ServiceException("未知的账号等级");
			}
			//查询社区信息
			switch (accountLevel) {
			case 2:
			BcRegion region = bcRegionService.getDistrictByCode(systemUser.getDistrictsCode().toString());
			if (Objects.nonNull(region)) {
			departmentName = region.getRegionName();
			}
			break;
			case 3:
			ComStreet street = comStreetService.getById(systemUser.getStreetId().toString());
			if (Objects.nonNull(street)) {
			BcRegion district = bcRegionService.getDistrictByCode(street.getAreaCode().toString());
			departmentName = Objects.nonNull(district) ? district.getRegionName() + "-" + street.getName() : street.getName();
			}
			break;
			case 4:
			ComAct act = comActService.getById(systemUser.getCommunityId());
			if (Objects.nonNull(act)) {
			ComStreet street2 = comStreetService.getById(systemUser.getStreetId().toString());
			BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
			departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
			}
			break;
			}
			} else {
			throw new ServiceException("无权申请");
			@@ -839,6 +875,7 @@
			record1.setSuperiorId(superiorId);
			record1.setSort(count + 1);
			record1.setComment(dto.getComment());
			record1.setDepartmentName(departmentName);
			complaintAuditRecordService.save(record1);
			}

			@@ -872,7 +909,7 @@
			.eq(ComplaintAuditRecord::getAuditType, 1)
			.eq(ComplaintAuditRecord::getLatestFlag, 1)
			.eq(ComplaintAuditRecord::getAuditStatus, 0)
			.ne(ComplaintAuditRecord::getSuperiorId, superiorId)
			.eq(ComplaintAuditRecord::getSuperiorId, superiorId)
			.eq(ComplaintAuditRecord::getReportType, accountLevel)
			.eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
			.last("LIMIT 1"));