springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java
@@ -15,13 +15,9 @@ import com.panzhihua.common.service.auth.TokenService; import com.panzhihua.common.utlis.HttpClientUtil; import com.panzhihua.common.utlis.ServletUtils; import com.panzhihua.sangeshenbian.model.entity.SystemMenu; import com.panzhihua.sangeshenbian.model.entity.SystemRoleMenu; import com.panzhihua.sangeshenbian.model.entity.SystemUser; import com.panzhihua.sangeshenbian.model.entity.*; import com.panzhihua.sangeshenbian.model.vo.RegionVO; import com.panzhihua.sangeshenbian.service.ISystemMenuService; import com.panzhihua.sangeshenbian.service.ISystemRoleMenuService; import com.panzhihua.sangeshenbian.service.ISystemUserService; import com.panzhihua.sangeshenbian.service.*; import com.panzhihua.sangeshenbian.utils.SignatureUtil; import com.panzhihua.sangeshenbian.warpper.*; import io.swagger.annotations.Api; @@ -30,6 +26,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; @@ -73,6 +70,13 @@ @Resource private ISystemMenuService systemMenuService; @Resource private IBcRegionService bcRegionService; @Resource private IComStreetService comStreetService; @Resource private IComActService comActService; @@ -227,6 +231,25 @@ if(0 < count){ return R.fail("手机号重复。"); } String districtsCode = systemUser.getDistrictsCode(); if (!StringUtils.isEmpty(districtsCode)){ BcRegion bcRegion = bcRegionService.getOne(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getRegionCode, districtsCode)); systemUser.setDistricts(bcRegion.getRegionName()); } String streetId = systemUser.getStreetId(); if (!StringUtils.isEmpty(streetId)){ ComStreet comStreet = comStreetService.getById(streetId); systemUser.setStreet(comStreet.getName()); } Long communityId = systemUser.getCommunityId(); if (communityId != null){ ComAct act = comActService.getById(communityId); systemUser.setCommunity(act.getName()); } systemUser.setStatus(1); systemUser.setCreateTime(LocalDateTime.now()); systemUserService.save(systemUser); @@ -243,6 +266,25 @@ if(0 < count){ return R.fail("手机号重复。"); } String districtsCode = systemUser.getDistrictsCode(); if (!StringUtils.isEmpty(districtsCode)){ BcRegion bcRegion = bcRegionService.getOne(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getRegionCode, districtsCode)); systemUser.setDistricts(bcRegion.getRegionName()); } String streetId = systemUser.getStreetId(); if (!StringUtils.isEmpty(streetId)){ ComStreet comStreet = comStreetService.getById(streetId); systemUser.setStreet(comStreet.getName()); } Long communityId = systemUser.getCommunityId(); if (communityId != null){ ComAct act = comActService.getById(communityId); systemUser.setCommunity(act.getName()); } systemUser.setStatus(1); systemUser.setCreateTime(LocalDateTime.now()); systemUserService.updateById(systemUser); springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
@@ -59,6 +59,7 @@ .eq(PartyMember::getDelFlag, 0)); PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO(); partyCardInfoVO.setAvatar(partyMember.getAvatar()); partyCardInfoVO.setName(partyMember.getName()); partyCardInfoVO.setIdCard(partyMember.getIdNumber()); partyCardInfoVO.setDistricts(partyMember.getDistricts()); @@ -181,10 +182,12 @@ if (accountLevel == 1){ adminPermissions.setName(String.format("%s%s%s%s%s", "攀枝花市",districts, street, community, "管理员")); }if (accountLevel == 2) { adminPermissions.setIdentity(2); adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员")); } else if (accountLevel == 3) { adminPermissions.setIdentity(2); adminPermissions.setName(String.format("%s%s%s", street, community, "管理员")); } else if (accountLevel == 4) { adminPermissions.setName(String.format("%s%s", community, "管理员")); adminPermissions.setIdentity(2); } permissions.add(adminPermissions); springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/PartyCardInfoVO.java
@@ -16,6 +16,9 @@ @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "头像") private String avatar; @ApiModelProperty(value = "身份证号码") private String idCard;
@@ -249,6 +249,8 @@ public void buttonPermission(ComplaintVO vo, Optional<SystemUser> systemUserByPhone){ vo.setListControlsButtonStatus(1); 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")); //没有审核数据，且正在办理，则按钮权限是添加人员的 @@ -284,6 +286,48 @@ } } }else{ //审核状态为待审核，需要授权审核按钮 if((one.getAuditStatus() == 5 || one.getAuditStatus() == 7) && systemUserByPhone.isPresent()){ SystemUser systemUser = systemUserByPhone.get(); String targetId = ""; Integer accountLevel = 5; //获取当前身份，1=党员，2=管理员 Integer identity = (Integer) redisUtils.get("identity:" + systemUser.getPhone()); if(2 == identity){ 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; } 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 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")); @@ -455,21 +499,26 @@ detail.setAuditButtonStatus(0); } } //已办结，显示评价按钮 int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0)); if(detail.getStatus() == 3 && 0 == count){ if(systemUserByPhone.isPresent()){ SystemUser systemUser = systemUserByPhone.get(); Integer isAdmin = systemUser.getIsAdmin(); if(accountLevel.compareTo(detail.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){ detail.setEvaluateButtonStatus(0); } }else{ if(detail.getReportType() == 5){ detail.setEvaluateButtonStatus(0); } } } buttonPermission(detail, systemUserByPhone); // //已办结，显示评价按钮 // int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0)); // if(detail.getStatus() == 3 && 0 == count){ // if(systemUserByPhone.isPresent()){ // SystemUser systemUser = systemUserByPhone.get(); // Integer isAdmin = systemUser.getIsAdmin(); // if(accountLevel.compareTo(detail.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)){ // detail.setEvaluateButtonStatus(0); // } // }else{ // if(detail.getReportType() == 5){ // detail.setEvaluateButtonStatus(0); // } // } // } return detail; }
