From 19fd73f4c8322b0d0e0f131d163ef1b9fc5a1757 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Sat, 30 Aug 2025 03:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=BD=E5=B7=A5=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/IdCardEncryptorUtil.java        |  3 +++
 .../impl/SubConstructionUserServiceImpl.java     | 10 ++++++++--
 .../BusConstructionBlacklistServiceImpl.java     | 16 +++++++++++-----
 .../impl/BusProjectTeamMemberServiceImpl.java    |  6 ++++--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/IdCardEncryptorUtil.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/IdCardEncryptorUtil.java
index 8ec24f62..32acb77f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/IdCardEncryptorUtil.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/IdCardEncryptorUtil.java
@@ -46,6 +46,9 @@ public class IdCardEncryptorUtil {
      * @return 解密后的身份证号码
      */
     public String decrypt(String encrypted) {
+        if (encrypted == null) {
+            return null;
+        }
         return aes.decryptStr(encrypted);
     }
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
index 7941f56d..b3f07149 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
@@ -672,7 +672,10 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
         }
         // 解密身份证号码
         String decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
-        String hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
+        String hide = "";
+        if (StringUtils.isNotEmpty(decrypt)) {
+            hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
+        }
         constructionUserVo.setSfzNumber(hide);
         // 隐藏手机号码
         String hidePhone = DesensitizedUtil.mobilePhone(constructionUserVo.getPhone());
@@ -814,7 +817,10 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
             }
             // 解密身份证号码
             String decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
-            String hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
+            String hide = null;
+            if (decrypt != null) {
+                hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
+            }
             constructionUserVo.setSfzNumber(hide);
             // 隐藏手机号码
             String hidePhone = DesensitizedUtil.mobilePhone(constructionUserVo.getPhone());
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
index 69cfcd98..ac385706 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java
@@ -14,18 +14,18 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.project.domain.BusConstructionBlacklist;
+import org.dromara.common.utils.IdCardEncryptorUtil;
 import org.dromara.contractor.domain.SubConstructionUser;
+import org.dromara.contractor.service.ISubConstructionUserService;
+import org.dromara.project.domain.BusConstructionBlacklist;
 import org.dromara.project.domain.BusProjectTeamMember;
 import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistCreateReq;
 import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistQueryReq;
 import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo;
 import org.dromara.project.mapper.BusConstructionBlacklistMapper;
 import org.dromara.project.service.IBusConstructionBlacklistService;
-import org.dromara.contractor.service.ISubConstructionUserService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.project.service.IBusProjectTeamMemberService;
-import org.dromara.common.utils.IdCardEncryptorUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -73,7 +73,10 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
         BeanUtils.copyProperties(constructionBlacklist, vo);
         // 解密身份证号码
         String decrypt = idCardEncryptorUtil.decrypt(constructionBlacklist.getSfzNumber());
-        String hide = IdcardUtil.hide(decrypt, 11, 17);
+        String hide = null;
+        if (decrypt != null) {
+            hide = IdcardUtil.hide(decrypt, 11, 17);
+        }
         vo.setSfzNumber(hide);
         return vo;
     }
@@ -98,7 +101,10 @@ public class BusConstructionBlacklistServiceImpl extends ServiceImpl<BusConstruc
             BusConstructionBlacklistVo vo = new BusConstructionBlacklistVo();
             BeanUtils.copyProperties(entity, vo);
             String decrypt = idCardEncryptorUtil.decrypt(entity.getSfzNumber());
-            String hide = IdcardUtil.hide(decrypt, 11, 17);
+            String hide = null;
+            if (decrypt != null) {
+                hide = IdcardUtil.hide(decrypt, 11, 17);
+            }
             vo.setSfzNumber(hide);
             return vo;
         }).toList();
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index d1af1eb5..bcb22025 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -288,7 +288,9 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         // 关联获取施工人员信息
         Long memberId = projectTeamMember.getMemberId();
         SysUserVo userVo = userService.selectUserById(memberId);
-        projectTeamMemberVo.setMemberName(userVo.getNickName());
+        if (userVo != null) {
+            projectTeamMemberVo.setMemberName(userVo.getNickName());
+        }
         return projectTeamMemberVo;
     }
 
@@ -318,7 +320,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
             sysUserLqw.select(SysUser::getUserId);
             sysUserLqw.like(SysUser::getNickName, memberName);
             List<SysUserVo> userVos = userService.selectUserListByNikeName(memberName);
-            if(!userVos.isEmpty()){
+            if (!userVos.isEmpty()) {
                 List<Long> userIds = userVos.stream().map(SysUserVo::getUserId).distinct().filter(Objects::nonNull).toList();
                 lqw.in(BusProjectTeamMember::getMemberId, userIds);
             }