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_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
index 0e52346..22ba557 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdcardUtil;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbMemberRoleTypeEnum;
@@ -22,6 +23,7 @@
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.common.service.community.CommunityWestService;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.*;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -37,10 +39,6 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.RichTextUtil;
-import com.panzhihua.common.utlis.SensitiveUtil;
-import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.*;
import com.panzhihua.service_dangjian.model.dos.*;
import com.panzhihua.service_dangjian.service.ComPbMemberWestService;
@@ -75,6 +73,8 @@
private CommunityWestService communityWestService;
@Resource
private UserService userService;
+ @Resource
+ private ComPbMemberDAO comPbMemberDAO;
/**
* 新增党员
@@ -96,6 +96,7 @@
Date date = new Date();
comPbMemberWestDO1.setCreateAt(date);
comPbMemberWestDO1.setUpdateAt(date);
+ comPbMemberWestDO1.setId(null);
int insert = comPbMemberWestDAO.insert(comPbMemberWestDO1);
if (insert > 0) {
// 删除已驳回的记录
@@ -269,6 +270,15 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+ Long communityId = pagePartyOrganizationVO.getCommunityId();
+ if (null != communityId){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ pagePartyOrganizationVO.setCommunityIds(communityIds);
+ }
IPage<PartyBuildingMemberVO> iPage = comPbMemberWestDAO.queryAllByLimit(page, pagePartyOrganizationVO);
iPage.getRecords().forEach(record -> {
record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
@@ -479,6 +489,7 @@
*/
@Override
public R adddYnamic(PartyBuildingComPbDynVO partyCommitteeVO) {
+ partyCommitteeVO.setId(null);
ComPbDynDO comPbDynDO = new ComPbDynDO();
BeanUtils.copyProperties(partyCommitteeVO, comPbDynDO);
comPbDynDO.setCreateAt(new Date());
@@ -555,6 +566,21 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+ Long communityId = partyBuildingComPbDynVO.getCommunityId();
+ if (null != communityId){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ partyBuildingComPbDynVO.setCommunityIds(communityIds);
+ }else {
+ //西区大屏
+ if (CollUtil.isEmpty(partyBuildingComPbDynVO.getCommunityIds()) || "wx0cef797390444b75".equals(partyBuildingComPbDynVO.getAppId())){
+ List<Long> selectDistinctCommunityId = comPbMemberDAO.selectDistinctCommunityId("西区");
+ partyBuildingComPbDynVO.setCommunityIds(selectDistinctCommunityId);
+ }
+ }
IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
List<PartyBuildingComPbDynVO> records = iPage.getRecords();
if (!(ObjectUtils.isEmpty(records))) {
@@ -577,7 +603,7 @@
* @return 删除结果
*/
@Override
- public R deleteYnamic(Integer id) {
+ public R deleteYnamic(Long id) {
int delete = comPbDynDAO.deleteById(id);
if (delete > 0) {
return R.ok();
--
Gitblit v1.7.1