From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
index e5aa5b3..21ec8b3 100644
--- a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
+++ b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
@@ -25,8 +25,10 @@
import org.springblade.modules.social.mapper.SocialMapper;
import org.springblade.modules.social.service.ISocialService;
import org.springblade.modules.social.vo.SocialVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -37,9 +39,8 @@
* @since 2021-07-16
*/
@Service
-@AllArgsConstructor
public class SocialServiceImpl extends ServiceImpl<SocialMapper, Social> implements ISocialService {
- private final ISocialService iSocialService;
+
@Override
@@ -51,8 +52,26 @@
public void importUser(List<SocialExcel> data, Boolean isCovered,String deptid) {
data.forEach(SocialExcel -> {
Social social = Objects.requireNonNull(BeanUtil.copy(SocialExcel, Social.class));
+ if (null!=social.getBirthday()) {
+ social.setBirthday(social.getBirthday());
+ }
+ if (null!=social.getTelephone() && !"".equals(social.getTelephone())) {
+ social.setTelephone(social.getTelephone());
+ }
+ if (null!=social.getResidence() && !"".equals(social.getResidence())) {
+ social.setResidence(social.getResidence());
+ }
+ if (null!=social.getAddress() && !"".equals(social.getAddress())) {
+ social.setAddress(social.getAddress());
+ }
+ if (null!=social.getNature() && !"".equals(social.getNature())) {
+ social.setNature(social.getNature());
+ }
+ if (null!=social.getNation() && !"".equals(social.getNation())) {
+ social.setNation(social.getNation());
+ }
social.setDeptid(deptid);
- iSocialService.upSoil(social.getCardid());
+ this.upSoil(social.getCardid());
this.save(social);
});
}
--
Gitblit v1.9.3