Browse Source

feat: 站点人员社保卡fix

zhangying 10 months ago
parent
commit
02dba72860

+ 2 - 3
src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java

@@ -17,7 +17,6 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -108,7 +107,7 @@ public class SiteUserImpl implements SiteUserService {
         List<String> byUserNoSiteId = pcSiteUserMapper.selectByUserNo(data.userNo);
         List<String> byIdCardSiteId = pcSiteUserMapper.selectByIdCard(data.idCard);
         List<String> bySocialSecurityCard = new ArrayList<>();
-        if (!data.getSocialSecurityCard().isEmpty() && !data.getSocialSecurityCard().isBlank()) {
+        if (data.getSocialSecurityCard() != null && !data.getSocialSecurityCard().isBlank()) {
             bySocialSecurityCard = pcSiteUserMapper.selectBySocialSecurityCard(data.socialSecurityCard);
         }
 
@@ -190,7 +189,7 @@ public class SiteUserImpl implements SiteUserService {
                 throw new BaseException("500", "该身份证已绑定其他驿站人员");
             }
             // 社保卡非必填
-            if (!data.getSocialSecurityCard().isEmpty() && !data.getSocialSecurityCard().isBlank()) {
+            if (data.getSocialSecurityCard() != null && !data.getSocialSecurityCard().isBlank()) {
                 if (!bySocialSecurityCard.isEmpty() && !bySocialSecurityCard.contains(data.siteUserID)) {
                     throw new BaseException("500", "该社保卡已绑定其他驿站人员");
                 }