From daea1642642f20998bfbf1d0c72695a6bae260d7 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 17 三月 2025 14:58:07 +0800
Subject: [PATCH] 党员认证、党员上级角色切换
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 43 ++++++++++++++++---------------------------
1 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
index 1e6fd63..2e9357c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
@@ -1,56 +1,36 @@
package com.panzhihua.sangeshenbian.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.idev.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
+import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.dao.PartyMemberMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
-import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
-import com.panzhihua.sangeshenbian.model.entity.BcRegion;
-import com.panzhihua.sangeshenbian.model.entity.ComAct;
-import com.panzhihua.sangeshenbian.model.entity.ComStreet;
-import com.panzhihua.sangeshenbian.model.entity.PartyMember;
-import com.panzhihua.sangeshenbian.model.entity.SystemUser;
+import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
-import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberTemplate;
-import com.panzhihua.sangeshenbian.service.IBcRegionService;
-import com.panzhihua.sangeshenbian.service.IComActService;
-import com.panzhihua.sangeshenbian.service.IComStreetService;
-import com.panzhihua.sangeshenbian.service.IPartyMemberService;
-import com.panzhihua.sangeshenbian.service.ISystemUserService;
-import com.panzhihua.sangeshenbian.warpper.PartyMemberApplicationRequest;
-import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
-import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery;
-import com.panzhihua.sangeshenbian.warpper.PendingPartyMemberApplicationVO;
+import com.panzhihua.sangeshenbian.service.*;
+import com.panzhihua.sangeshenbian.warpper.*;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* <p>
@@ -68,6 +48,7 @@
private final IBcRegionService bcRegionService;
private final IComStreetService comStreetService;
private final IComActService comActService;
+ private final RedisUtils redisUtils;
/**
* 党员分页查询列表
*
@@ -341,10 +322,18 @@
.eq(SystemUser::getPhone, loginUserInfo.getPhone())
.eq(SystemUser::getIsAdmin, 1)
.ne(SystemUser::getStatus, 3)
+ .ne(SystemUser::getAccountLevel, 5)
.last("LIMIT 1"));
+
+
if (adminUser == null){
throw new ServiceException("无权审核");
+ }
+
+ Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
+ if(identity != null && identity != 2){
+ throw new ServiceException("请切换至管理员身份");
}
int accountLevel = adminUser.getAccountLevel();
@@ -357,7 +346,7 @@
streetId = adminUser.getStreetId();
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
districtsCode = adminUser.getDistrictsCode();
- } else if(accountLevel != ReportTypeEnum.PARTY.getCode()){
+ } else if(accountLevel != ReportTypeEnum.CITY.getCode()){
throw new ServiceException("无权审核:未知等级");
}
String phone = loginUserInfo.getPhone();
--
Gitblit v1.7.1