From d130547c1f3b64cf8544261cdf1d9146ff319756 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 19 五月 2025 13:13:30 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 f41fb40..68af4ae 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
@@ -59,6 +59,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);
         // 判断当前登录用户是否有权限查看这个社区的党员
 //        if(loginUserInfo.getAccountLevel()==1){
@@ -146,7 +154,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");

--
Gitblit v1.7.1