From ddb9b1a011b26fec839618fe908dd7d1bacf4a9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 20:02:36 +0800
Subject: [PATCH] 1.保安单位树接口修改 2.现场保安员，单位检查字段修改，接口修改 3.缴费记录接口修改 4.出资人，管理人员字段调整，接口修改，导出新增示例 5.考试中题目返回去除答案
---
src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
index 4c3fcf2..3757707 100644
--- a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
@@ -18,6 +18,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.member.entity.Member;
import org.springblade.modules.member.excel.memberExcel;
@@ -25,6 +27,8 @@
import org.springblade.modules.member.service.IMemberService;
import org.springblade.modules.member.vo.MemberVO;
import org.springblade.modules.shareholder.entity.Shareholder;
+import org.springblade.modules.system.service.IUserDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
@@ -41,6 +45,9 @@
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements IMemberService {
+ @Autowired
+ private IUserDeptService userDeptService;
+
@Override
public IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member) {
return page.setRecords(baseMapper.selectMemberPage(page, member));
@@ -55,6 +62,11 @@
public void importmember(List<memberExcel> data, Boolean isCovered) {
data.forEach(memberExcel -> {
Member member = Objects.requireNonNull(BeanUtil.copy(memberExcel, Member.class));
+ String deptId = userDeptService.selectIn(memberExcel.getDeptId());
+ if (null==deptId || deptId==""){
+ throw new ServiceException("公司名:["+memberExcel.getDeptId()+"]不存在!");
+ }
+ member.setDeptId(deptId);
try {
member.setRtime(new SimpleDateFormat("yyyy/MM/dd").parse(memberExcel.getRtime()));
} catch (ParseException e) {
--
Gitblit v1.9.3