From dc90deebee3f527626fba78090919182a856d082 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 14 五月 2025 16:19:43 +0800
Subject: [PATCH] 管理后台党员审核bug修改 修改小程序党员审核上级可审核自己
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 18 +++++++++++++++++-
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java | 21 +++++++++++++++++----
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml | 2 +-
3 files changed, 35 insertions(+), 6 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 702e318..d19c64b 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
@@ -58,6 +58,14 @@
*/
@Override
public Page<PartyMember> pageList(PartyMemberQuery query, SystemUserVo loginUserInfo) {
+ SystemUser user = systemUserService.getById(loginUserInfo.getId());
+ if (Objects.isNull(user)){
+ throw new ServiceException("用户不存在");
+ }
+ loginUserInfo.setAccountLevel(user.getAccountLevel());
+ loginUserInfo.setDistrictsCode(user.getDistrictsCode());
+ loginUserInfo.setStreetId(user.getStreetId());
+ loginUserInfo.setCommunityId(user.getCommunityId());
return baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()),query,loginUserInfo);
}
/**
@@ -125,7 +133,15 @@
*/
@Override
public void export(PartyMemberQuery query, SystemUserVo loginUserInfo) throws IOException {
- List<PartyMember> list = baseMapper.queryList(query,loginUserInfo);
+ SystemUser user = systemUserService.getById(loginUserInfo.getId());
+ if (Objects.isNull(user)){
+ throw new ServiceException("用户不存在");
+ }
+ loginUserInfo.setAccountLevel(user.getAccountLevel());
+ loginUserInfo.setDistrictsCode(user.getDistrictsCode());
+ loginUserInfo.setStreetId(user.getStreetId());
+ loginUserInfo.setCommunityId(user.getCommunityId());
+ List<PartyMember> list = baseMapper.queryList(query,loginUserInfo);
List<PartyMemberExcel> partyMemberExcels = BeanUtil.copyToList(list, PartyMemberExcel.class);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java
index 48ee471..21109b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.sangeshenbian.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +11,7 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
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.vo.RegionVO;
@@ -22,6 +24,7 @@
import com.panzhihua.sangeshenbian.warpper.SystemUserList;
import com.panzhihua.sangeshenbian.warpper.SystemUserListVo;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -34,10 +37,12 @@
* @author zhibing.pu
* @Date 2025/2/18 22:30
*/
+@Slf4j
@Service
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemUser> implements ISystemUserService {
private final IComActService comActService;
+ private final IComStreetService comStreetService;
/**
* 获取列表数据
* @param query
@@ -117,7 +122,9 @@
*/
@Override
public List<RegionVO> getRegionTree(SystemUserVo loginUserInfo) {
- Integer accountLevel = loginUserInfo.getAccountLevel();
+ log.info("getRegionTree入参：{}",JSONObject.toJSONString(loginUserInfo));
+ SystemUser systemUser = getById(loginUserInfo.getId());
+ Integer accountLevel = systemUser.getAccountLevel();
List<RegionVO> regionTree = new ArrayList<>();
switch (accountLevel) {
case 1:
@@ -133,17 +140,23 @@
});
break;
case 2:
- regionTree = baseMapper.getStreet(loginUserInfo.getDistrictsCode());
+ regionTree = baseMapper.getStreet(systemUser.getDistrictsCode());
regionTree.forEach(regionVO->{
List<RegionVO> communities = baseMapper.getCommunity(regionVO.getId());
regionVO.setChildren(communities);
});
break;
case 3:
- regionTree = baseMapper.getCommunity(loginUserInfo.getStreetId());
+ ComStreet street = comStreetService.getById(systemUser.getStreetId());
+ RegionVO streetVO = new RegionVO();
+ streetVO.setId(street.getStreetId());
+ streetVO.setName(street.getName());
+ List<RegionVO> communities = baseMapper.getCommunity(systemUser.getStreetId());
+ streetVO.setChildren(communities);
+ regionTree = Lists.newArrayList(streetVO);
break;
case 4:
- ComAct byId = comActService.getById(loginUserInfo.getCommunityId());
+ ComAct byId = comActService.getById(systemUser.getCommunityId());
RegionVO regionVO = new RegionVO();
regionVO.setId(byId.getCommunityId().toString());
regionVO.setName(byId.getName());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
index 38c93bc..a326da3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
@@ -129,7 +129,7 @@
FROM
sgsb_party_member
WHERE
- audit_status = 0 and phone != ${phone} and del_flag = 0
+ audit_status = 0 and del_flag = 0
<if test="accountLevel==2">
and districts_code = #{districtsCode}
</if>
--
Gitblit v1.7.1