From af7f103a38b1098a6b0280c70d9c3dda9913bd2c Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 13 Nov 2025 21:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=83=A8=E9=97=A8id=E4=B8=8E=E5=85=AC=E5=8F=B8id?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/util/BusinessDeptHandleUtil.java | 2 +- .../BusinessHeaderInterceptorTest.java | 37 ++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java index 474e1cd8..ef47614e 100644 --- a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java +++ b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java @@ -47,7 +47,7 @@ public class BusinessDeptHandleUtil { if (companyIdHeader != null && !companyIdHeader.isBlank()) { // 根据请求头中的公司 ID 过滤出当前用户的公司部门信息 Set companyDeptSetByCompanyId = companyDeptSet.stream() - .filter(companyDeptInfo -> companyDeptInfo.getCompanyId().toString().equals(companyIdHeader)) + .filter(companyDeptInfo -> companyDeptInfo.getCompanyId().equals(companyIdHeader)) .collect(Collectors.toSet()); if (companyDeptSetByCompanyId.isEmpty()) { // 当前公司下没有部门 diff --git a/zt-framework/zt-spring-boot-starter-biz-business/src/test/java/com/zt/plat/framework/business/interceptor/BusinessHeaderInterceptorTest.java b/zt-framework/zt-spring-boot-starter-biz-business/src/test/java/com/zt/plat/framework/business/interceptor/BusinessHeaderInterceptorTest.java index 3f67fb81..8e600c27 100644 --- a/zt-framework/zt-spring-boot-starter-biz-business/src/test/java/com/zt/plat/framework/business/interceptor/BusinessHeaderInterceptorTest.java +++ b/zt-framework/zt-spring-boot-starter-biz-business/src/test/java/com/zt/plat/framework/business/interceptor/BusinessHeaderInterceptorTest.java @@ -3,7 +3,6 @@ package com.zt.plat.framework.business.interceptor; import com.zt.plat.framework.common.enums.UserTypeEnum; import com.zt.plat.framework.common.pojo.CompanyDeptInfo; import com.zt.plat.framework.security.core.LoginUser; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; @@ -12,10 +11,14 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.web.method.HandlerMethod; import java.io.PrintWriter; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import static com.zt.plat.framework.test.core.util.RandomUtils.randomPojo; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; import static org.springframework.security.core.context.SecurityContextHolder.getContext; @@ -104,11 +107,11 @@ class BusinessHeaderInterceptorTest { // 构造 loginUser，包含多个公司部门 CompanyDeptInfo deptInfo1 = new CompanyDeptInfo(); - deptInfo1.setCompanyId(1L); - deptInfo1.setDeptId(2L); + deptInfo1.setCompanyId(String.valueOf(1L)); + deptInfo1.setDeptId(String.valueOf(2L)); CompanyDeptInfo deptInfo2 = new CompanyDeptInfo(); - deptInfo2.setCompanyId(2L); - deptInfo2.setDeptId(3L); + deptInfo2.setCompanyId(String.valueOf(2L)); + deptInfo2.setDeptId(String.valueOf(3L)); Set deptSet = new HashSet<>(); deptSet.add(deptInfo1); deptSet.add(deptInfo2); @@ -138,8 +141,8 @@ class BusinessHeaderInterceptorTest { // 构造 loginUser，只有一个公司且公司下只有一个部门 CompanyDeptInfo deptInfo = new CompanyDeptInfo(); - deptInfo.setCompanyId(100L); - deptInfo.setDeptId(200L); + deptInfo.setCompanyId(String.valueOf(100L)); + deptInfo.setDeptId(String.valueOf(200L)); Set deptSet = new HashSet<>(); deptSet.add(deptInfo); LoginUser loginUser = randomPojo(LoginUser.class, o -> o.setId(1L) @@ -169,11 +172,11 @@ class BusinessHeaderInterceptorTest { // 构造 loginUser，多个公司部门 CompanyDeptInfo deptInfo1 = new CompanyDeptInfo(); - deptInfo1.setCompanyId(1L); - deptInfo1.setDeptId(2L); + deptInfo1.setCompanyId(String.valueOf(1L)); + deptInfo1.setDeptId(String.valueOf(2L)); CompanyDeptInfo deptInfo2 = new CompanyDeptInfo(); - deptInfo2.setCompanyId(2L); - deptInfo2.setDeptId(3L); + deptInfo2.setCompanyId(String.valueOf(2L)); + deptInfo2.setDeptId(String.valueOf(3L)); Set deptSet = new HashSet<>(); deptSet.add(deptInfo1); deptSet.add(deptInfo2); @@ -204,11 +207,11 @@ class BusinessHeaderInterceptorTest { // 构造 loginUser，只有其他公司部门 CompanyDeptInfo deptInfo1 = new CompanyDeptInfo(); - deptInfo1.setCompanyId(1L); - deptInfo1.setDeptId(2L); + deptInfo1.setCompanyId(String.valueOf(1L)); + deptInfo1.setDeptId(String.valueOf(2L)); CompanyDeptInfo deptInfo2 = new CompanyDeptInfo(); - deptInfo2.setCompanyId(2L); - deptInfo2.setDeptId(3L); + deptInfo2.setCompanyId(String.valueOf(2L)); + deptInfo2.setDeptId(String.valueOf(3L)); Set deptSet = new HashSet<>(); deptSet.add(deptInfo1); deptSet.add(deptInfo2);