From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 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 2e9357c..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");
@@ -228,11 +244,12 @@
                             // 验证社区是否存在且属于该街道
                             // 实际代码应该是调用相应的Service查询社区信息
                             ComAct comAct = comActService.getCommunityByNameAndStreet(communityName, comStreet.getStreetId());
-                            streetId = comStreet.getStreetId();
-                            communityId = comAct.getCommunityId();
                             if (Objects.isNull(comAct)) {
                                 isValid = false;
                                 errorMsg.append("社区不存在或不属于所选街道; ");
+                            } else {
+                                streetId = comStreet.getStreetId();
+                                communityId = comAct.getCommunityId();
                             }
                         }
                     }
@@ -256,8 +273,8 @@
                 //导入党员默认审核通过
                 partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
                 partyMember.setSource(1);//管理后台录入
-                //默认头像 TODO 默认头像
-                partyMember.setAvatar("");
+                //默认头像
+                partyMember.setAvatar("https://www.psciio.com//idcard/f15c91f940624ed59537ecced1059f18.jpg");
                 // 根据身份证号设置性别
                 if (StrUtil.isNotBlank(template.getIdNumber())) {
                     partyMember.setGender(getGender(template.getIdNumber()));

--
Gitblit v1.7.1