From be9179e444b22bf7d4b69c64745decd91696d67b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:28:48 +0800
Subject: [PATCH] 1.诉求新增录音 2.上级多角色调整
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 273 +++++++++++++++++++++++++++++++----------------------
1 files changed, 159 insertions(+), 114 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index 2b28898..73d9ee9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -107,7 +107,8 @@
SystemUser systemUser = identityInformationVO.getSystemUser();
Integer identity = identityInformationVO.getIdentity();
if (identity == 2) {
- accountLevel = systemUser.getAccountLevel();
+ SystemUserLevel systemUserLevel = identityInformationVO.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -118,33 +119,33 @@
case 2:
//区县级
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
break;
case 3:
//街道
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
- complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
+ complaint.setStreetId(Long.valueOf(systemUserLevel.getStreetId()));
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
break;
case 4:
//社区
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
- complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
- complaint.setCommunityId(systemUser.getCommunityId());
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
+ complaint.setStreetId(Long.valueOf(systemUserLevel.getStreetId()));
+ complaint.setCommunityId(systemUserLevel.getCommunityId());
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
break;
case 5:
//党员
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
- complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
- complaint.setCommunityId(systemUser.getCommunityId());
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
+ complaint.setStreetId(Long.valueOf(systemUserLevel.getStreetId()));
+ complaint.setCommunityId(systemUserLevel.getCommunityId());
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
complaint.setPartyMemberId(partyMember.getId());
complaint.setReportUserName(partyMember.getName());
@@ -220,7 +221,8 @@
//上级
if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
- accountLevel = systemUser.getAccountLevel();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -228,15 +230,15 @@
break;
case 2:
//区县级
- targetId = Long.valueOf(systemUser.getDistrictsCode());
+ targetId = Long.valueOf(systemUserLevel.getDistrictsCode());
break;
case 3:
//街道
- targetId = Long.valueOf(systemUser.getStreetId());
+ targetId = Long.valueOf(systemUserLevel.getStreetId());
break;
case 4:
//社区
- targetId = systemUser.getCommunityId();
+ targetId = systemUserLevel.getCommunityId();
break;
case 5:
//党员
@@ -277,6 +279,8 @@
// 获取身份
IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
Integer identity = currentIdentityInformation.getIdentity();
+ SystemUserLevel systemUserLevel = currentIdentityInformation.getSystemUserLevel();
+ SystemUser systemUser1 = currentIdentityInformation.getSystemUser();
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
// .ne(ComplaintAuditRecord::getAuditType, 1)
@@ -284,12 +288,11 @@
.last(" limit 0, 1"));
//没有审核数据，且正在办理，则按钮权限是添加人员的
if (null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)) {
- if (systemUserByPhone.isPresent()) {
+ /* if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
//当前身份是管理员
- if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
+ if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5)) {
vo.setListControlsButtonStatus(0);
}
//如果当前身份是党员
@@ -300,6 +303,14 @@
if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
+ }*/
+ //当前身份是管理员
+ if (2 == identity && systemUserLevel.getLevel().compareTo(vo.getReportType()) == 0 && (systemUserLevel.getLevel() != 5)) {
+ vo.setListControlsButtonStatus(0);
+ }
+ //如果当前身份是党员
+ if (1 == identity && 5 == vo.getReportType()) {
+ vo.setListControlsButtonStatus(0);
}
}
//有审核数据，且正在办理
@@ -309,11 +320,17 @@
//判断当前审核状态
if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到上报审核的这一层
- if (systemUserByPhone.isPresent() && identity == 2) {
+ /* if (systemUserByPhone.isPresent() && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
//非党员用户，必须是管理员有权限
if (accountLevel.compareTo(one.getReportType()) == 0) {
+ vo.setListControlsButtonStatus(0);
+ }
+ }*/
+ if (identity == 2) {
+ //非党员用户，必须是管理员有权限
+ if (systemUserLevel.getLevel().compareTo(one.getReportType()) == 0) {
vo.setListControlsButtonStatus(0);
}
}
@@ -326,7 +343,11 @@
.orderByDesc(ComplaintAuditRecord::getSort)
.last(" limit 0, 1"));
if (null != one1) {
- if (systemUserByPhone.isPresent()) {
+ //非党员用户，必须是管理员有权限
+ if (identity == 2 && systemUserLevel.getLevel().compareTo(one1.getReportType()) == 0 && systemUserLevel.getLevel() != 5) {
+ vo.setListControlsButtonStatus(0);
+ }
+ /*if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -334,10 +355,10 @@
if (accountLevel.compareTo(one1.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
vo.setListControlsButtonStatus(0);
}
- }
+ }*/
} else {
//没有上一层审核通过的数据，则权限给到添加人
- if (systemUserByPhone.isPresent()) {
+ /*if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -353,6 +374,14 @@
if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
+ }*/
+ //当前身份是管理员
+ if (2 == identity && systemUserLevel.getLevel().compareTo(vo.getReportType()) == 0 && (systemUserLevel.getLevel() != 5)) {
+ vo.setListControlsButtonStatus(0);
+ }
+ //如果当前身份是党员
+ if (1 == identity && 5 == vo.getReportType()) {
+ vo.setListControlsButtonStatus(0);
}
}
}
@@ -363,7 +392,7 @@
//判断当前审核状态
if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到下报审核的这一层
- if (systemUserByPhone.isPresent()) {
+ /*if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -371,6 +400,9 @@
if (accountLevel.compareTo(one.getReportType()) == 0 && 1 == isAdmin && 2 == identity) {
vo.setListControlsButtonStatus(0);
}
+ }*/
+ if (2 == identity && systemUserLevel.getLevel().compareTo(one.getReportType()) == 0) {
+ vo.setListControlsButtonStatus(0);
}
}
}
@@ -378,44 +410,41 @@
//有审核数据，且为审核中
//审核状态为待审核，需要授权审核按钮
- if (null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && systemUserByPhone.isPresent()) {
+ if (null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- if (2 == currentIdentityInformation.getIdentity()) {
- accountLevel = systemUser.getAccountLevel();
- switch (accountLevel) {
- case 1:
- //市级
- targetId = "510400";
- break;
- case 2:
- //区县级
- targetId = systemUser.getDistrictsCode();
- break;
- case 3:
- //街道
- targetId = systemUser.getStreetId().toString();
- break;
- case 4:
- //社区
- targetId = systemUser.getCommunityId().toString();
- break;
- case 5:
- //党员
- PartyMember partyMember = partyMemberService.getPartyMemberByPhone(systemUser.getPhone());
- targetId = partyMember.getId().toString();
- break;
- }
+ accountLevel = systemUserLevel.getLevel();
+ switch (accountLevel) {
+ case 1:
+ //市级
+ targetId = "510400";
+ break;
+ case 2:
+ //区县级
+ targetId = systemUserLevel.getDistrictsCode();
+ break;
+ case 3:
+ //街道
+ targetId = systemUserLevel.getStreetId().toString();
+ break;
+ case 4:
+ //社区
+ targetId = systemUserLevel.getCommunityId().toString();
+ break;
+ case 5:
+ //党员
+ PartyMember partyMember = partyMemberService.getPartyMemberByPhone(systemUser.getPhone());
+ targetId = partyMember.getId().toString();
+ break;
+ }
- 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) {
- vo.setAuditButtonStatus(0);
- }
+ ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
+ .eq(ComplaintAuditRecord::getLatestFlag, 1));
+ if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId)) {
+ vo.setAuditButtonStatus(0);
}
}
@@ -423,7 +452,7 @@
//状态为已办结，判断评价按钮
int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
if ((vo.getStatus() == 3 || vo.getStatus() == 8) && 0 == count) {
- if (systemUserByPhone.isPresent()) {
+ /* if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -439,6 +468,14 @@
if (vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
+ }*/
+ //当前不是党员身份，需要是管理员才有权限
+ if (2 == identity && systemUserLevel.getLevel().compareTo(vo.getReportType()) == 0 && systemUserLevel.getLevel() != 5) {
+ vo.setEvaluateButtonStatus(0);
+ }
+ //当前是党员身份，只有是以党员身份提交的数据才有权限
+ if (1 == identity && vo.getReportType() == 5) {
+ vo.setEvaluateButtonStatus(0);
}
}
@@ -469,9 +506,9 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
Integer identity = identityInformation.getIdentity();
//上级
- if (systemUserByPhone.isPresent() && identity == 2) {
- SystemUser systemUser = systemUserByPhone.get();
- accountLevel = systemUser.getAccountLevel();
+ if (identity == 2) {
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -479,15 +516,15 @@
break;
case 2:
//区县级
- targetId = systemUser.getDistrictsCode();
+ targetId = systemUserLevel.getDistrictsCode();
break;
case 3:
//街道
- targetId = systemUser.getStreetId().toString();
+ targetId = systemUserLevel.getStreetId().toString();
break;
case 4:
//社区
- targetId = systemUser.getCommunityId().toString();
+ targetId = systemUserLevel.getCommunityId().toString();
break;
case 5:
//党员
@@ -553,7 +590,7 @@
@Override
public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
//获取当前身份
- IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
List<PermissionsVO> permissions = identityInformationVO.getPermissions();
if (permissions.isEmpty()) {
@@ -585,7 +622,7 @@
@Override
public void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO) {
//获取当前身份
- IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
List<PermissionsVO> permissions = identityInformationVO.getPermissions();
if (permissions.isEmpty()) {
@@ -597,7 +634,8 @@
if (identityInformationVO.getIdentity() == 2) {
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
- accountLevel = systemUser.getAccountLevel();
+ SystemUserLevel systemUserLevel = identityInformationVO.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
name = systemUser.getName();
} else if (identityInformationVO.getIdentity() == 1) {
accountLevel = 5;
@@ -634,6 +672,7 @@
String phone = loginUserInfoVO.getPhone();
IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser adminUser = identityInformationVO.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformationVO.getSystemUserLevel();
Long superiorId;
int reportType;
@@ -650,7 +689,7 @@
departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
reporter = partyMember.getName();
} else if (identityInformationVO.getIdentity() == 2) {
- int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
@@ -660,16 +699,16 @@
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
- superiorId = Long.parseLong(adminUser.getStreetId());
- reporterId = adminUser.getCommunityId();
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
+ reporterId = systemUserLevel.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = Long.parseLong(adminUser.getDistrictsCode());
- reporterId = Long.parseLong(adminUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
+ reporterId = Long.parseLong(systemUserLevel.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
- reporterId = Long.parseLong(adminUser.getDistrictsCode());
+ reporterId = Long.parseLong(systemUserLevel.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
- superiorId = adminUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
@@ -677,24 +716,25 @@
//查询社区信息
switch (accountLevel) {
case 2:
- BcRegion region = bcRegionService.getDistrictByCode(adminUser.getDistrictsCode().toString());
+ BcRegion region = bcRegionService.getDistrictByCode(systemUserLevel.getDistrictsCode().toString());
if (Objects.nonNull(region)) {
departmentName = region.getRegionName();
}
break;
case 3:
- ComStreet street = comStreetService.getById(adminUser.getStreetId().toString());
+ ComStreet street = comStreetService.getById(systemUserLevel.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(adminUser.getCommunityId());
+ ComAct act = comActService.getById(systemUserLevel.getCommunityId());
if (Objects.nonNull(act)) {
ComStreet street2 = comStreetService.getById(adminUser.getStreetId().toString());
BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
- departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ?
+ district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
}
break;
}
@@ -778,8 +818,8 @@
throw new ServiceException("无权下派");
}
- SystemUser adminUser = identityInformation.getSystemUser();
- int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
if (accountLevel == 4) {
throw new ServiceException("社区账号,无法下派！");
}
@@ -817,20 +857,20 @@
complaintAuditRecordService.save(record);
ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
complaintAuditRecord.setComplaintId(complaint.getId());
- complaintAuditRecord.setReportType(adminUser.getAccountLevel());
+ complaintAuditRecord.setReportType(systemUserLevel.getLevel());
Long superiorId = null;
- switch (adminUser.getAccountLevel()) {
+ switch (systemUserLevel.getLevel()) {
case 1:
superiorId = 510400L;//默认市级
break;
case 2:
- superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
break;
case 3:
- superiorId = Long.parseLong(adminUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
break;
case 4:
- superiorId = adminUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
break;
}
complaintAuditRecord.setSuperiorId(superiorId);
@@ -844,23 +884,24 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = identityInformation.getSystemUser();
- if (systemUser == null || identityInformation.getIdentity() != 2) {
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权审核");
}
Long superiorId = 0L;
- switch (systemUser.getAccountLevel()) {
+ switch (systemUserLevel.getLevel()) {
case 1:
superiorId = 510400L;//默认市级
break;
case 2:
- superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
break;
case 3:
- superiorId = Long.parseLong(systemUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
break;
case 4:
- superiorId = systemUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
break;
}
@@ -869,7 +910,7 @@
.eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
.eq(ComplaintAuditRecord::getAuditType, 2)
.eq(ComplaintAuditRecord::getLatestFlag, true)
- .eq(ComplaintAuditRecord::getReportType, systemUser.getAccountLevel())
+ .eq(ComplaintAuditRecord::getReportType, systemUserLevel.getLevel())
.eq(ComplaintAuditRecord::getSuperiorId, superiorId)
.last("LIMIT 1").one();
if (Objects.isNull(complaintAuditRecord)) {
@@ -901,7 +942,8 @@
public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
- SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
+ SystemUser systemUser = identityInformation.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
Long superiorId;
int reportType;
String departmentName = "";
@@ -915,8 +957,8 @@
reportType = ReportTypeEnum.COMMUNITY.getCode();
departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
reporter = partyMember.getName();
- } else if (identityInformation.getIdentity() == 2 && systemUser != null) {
- int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
+ } else if (identityInformation.getIdentity() == 2) {
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法延期申请！");
}
@@ -925,13 +967,13 @@
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
- superiorId = Long.parseLong(systemUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
} else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
- superiorId = systemUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
@@ -939,24 +981,25 @@
//查询社区信息
switch (accountLevel) {
case 2:
- BcRegion region = bcRegionService.getDistrictByCode(systemUser.getDistrictsCode().toString());
+ BcRegion region = bcRegionService.getDistrictByCode(systemUserLevel.getDistrictsCode().toString());
if (Objects.nonNull(region)) {
departmentName = region.getRegionName();
}
break;
case 3:
- ComStreet street = comStreetService.getById(systemUser.getStreetId().toString());
+ ComStreet street = comStreetService.getById(systemUserLevel.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());
+ ComAct act = comActService.getById(systemUserLevel.getCommunityId());
if (Objects.nonNull(act)) {
- ComStreet street2 = comStreetService.getById(systemUser.getStreetId().toString());
+ ComStreet street2 = comStreetService.getById(systemUserLevel.getStreetId().toString());
BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
- departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ?
+ district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
}
break;
}
@@ -992,19 +1035,20 @@
public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = identityInformation.getSystemUser();
- if (identityInformation.getIdentity() != 2 || systemUser == null) {
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权审核");
}
- int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
Long superiorId;
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
- superiorId = systemUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = Long.parseLong(systemUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
superiorId = 510400L;
} else {
@@ -1053,11 +1097,12 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser adminUser = identityInformation.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
- if (adminUser == null || identityInformation.getIdentity() != 2) {
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权下派");
}
- int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
/* if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}*/
@@ -1065,7 +1110,7 @@
// 使用基本类型比较并补充默认分支
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- String streetId = adminUser.getStreetId();
+ String streetId = systemUserLevel.getStreetId();
List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
@@ -1074,7 +1119,7 @@
dispatchVOList.add(dispatchVO);
}
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- String districtsCode = adminUser.getDistrictsCode();
+ String districtsCode = systemUserLevel.getDistrictsCode();
List<ComStreet> list = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, districtsCode));
for (ComStreet street : list) {
DispatchVO dispatchVO = new DispatchVO();
@@ -1108,12 +1153,12 @@
@Override
public Page<ComplaintTodoVO> getTodoList(BasePage basePage, LoginUserInfoVO loginUserInfo) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
- SystemUser systemUser = identityInformation.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
String targetId = "";
int isSuperior = 0;
//上级
if (identityInformation.getIdentity() == 2) {
- Integer accountLevel = systemUser.getAccountLevel();
+ Integer accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -1121,15 +1166,15 @@
break;
case 2:
//区县级
- targetId = systemUser.getDistrictsCode();
+ targetId = systemUserLevel.getDistrictsCode();
break;
case 3:
//街道
- targetId = systemUser.getStreetId();
+ targetId = systemUserLevel.getStreetId();
break;
case 4:
//社区
- targetId = systemUser.getCommunityId().toString();
+ targetId = systemUserLevel.getCommunityId().toString();
break;
}
isSuperior = 1;
--
Gitblit v1.7.1