From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 8b2bc37..702e318 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
@@ -14,6 +14,7 @@
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.model.entity.*;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
@@ -69,10 +70,23 @@
PartyMember partyMember = BeanUtil.copyProperties(dto, PartyMember.class);
String idNumber = dto.getIdNumber();
partyMember.setGender(getGender(idNumber));
+ BcRegion districtByCode = bcRegionService.getDistrictByCode(dto.getDistrictsCode());
+ if (Objects.nonNull(districtByCode)){
+ partyMember.setDistricts(districtByCode.getRegionName());
+ }
+ ComStreet street = comStreetService.getById(dto.getStreetId());
+ if (Objects.nonNull(street)){
+ partyMember.setStreet(street.getName());
+ }
+ ComAct act = comActService.getById(dto.getCommunityId());
+ if (Objects.nonNull(act)){
+ partyMember.setCommunity(act.getName());
+ }
if (Objects.isNull(dto.getId())) {
//添加
partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
+ partyMember.setFreezeStatus(FreezeStatusEnum.NORMAL.getCode());
partyMember.setSource(1);
save(partyMember);
} else {
@@ -214,11 +228,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();
}
}
}
@@ -242,8 +257,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()));
@@ -308,12 +323,8 @@
.eq(SystemUser::getPhone, loginUserInfo.getPhone())
.eq(SystemUser::getIsAdmin, 1)
.ne(SystemUser::getStatus, 3)
+ .ne(SystemUser::getAccountLevel, 5)
.last("LIMIT 1"));
-
- // 获取党员信息
- PartyMember partyMember = getOne(new LambdaQueryWrapper<PartyMember>()
- .eq(PartyMember::getPhone, loginUserInfo.getPhone())
- .eq(PartyMember::getDelFlag, 0));
@@ -322,7 +333,7 @@
}
Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
- if(identity == null || identity == 2){
+ if(identity != null && identity != 2){
throw new ServiceException("请切换至管理员身份");
}
--
Gitblit v1.7.1