From 8abf6327beafedeb97b37bfa760bd208327301e9 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 1 Nov 2023 16:24:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnterpriseStandardAuthUserServiceImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
index aa84590a..dc81382f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
@@ -93,6 +93,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         String userId = currentUser.getId();
         String deptId = currentUser.getDepartIds();
         SysDepart dept = sysDepartService.getById(deptId);
+        String curDeptName = dept == null ? "" : dept.getDepartName();
         List<String> standardIds = new ArrayList<>();
         records.forEach(kv -> standardIds.add(String.valueOf(kv.get(FieldCommon.ID))));
         List<LawsEnterpriseStandard> esList = enterpriseStandardService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>()
@@ -123,7 +124,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         List<String> levelDeptIds = standardLevelList.stream().map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
 
         // 起草部门有所有企标的查看权限
-        if (dept.getDepartName().equals(draftDepartName)) {
+        if (draftDepartName.equals(curDeptName)) {
             // 全部设置为有权限
             records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
         }
@@ -193,8 +194,9 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         SysUser user = sysUserService.getById(userId);
         String deptId = user.getDepartIds();
         SysDepart dept = sysDepartService.getById(deptId);
+        String curDeptName = dept == null ? "" : dept.getDepartName();
         // 起草部门有全部企标的查看权限
-        if (dept.getDepartName().equals(draftDepartName)) {
+        if (draftDepartName.equals(curDeptName)) {
             return true;
         }