zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整后台返回部门id与公司id类型为 string

Browse Source
This commit is contained in:
chenbowen
2025-11-13 21:39:27 +08:00
parent 2280d29fb6
commit af7f103a38
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/core/util/BusinessDeptHandleUtil.java
View File

@@ -47,7 +47,7 @@ public class BusinessDeptHandleUtil {
if (companyIdHeader != null && !companyIdHeader.isBlank()) {
// 根据请求头中的公司 ID 过滤出当前用户的公司部门信息
Set<CompanyDeptInfo> companyDeptSetByCompanyId = companyDeptSet.stream()
.filter(companyDeptInfo -> companyDeptInfo.getCompanyId().toString().equals(companyIdHeader))
.filter(companyDeptInfo -> companyDeptInfo.getCompanyId().equals(companyIdHeader))
.collect(Collectors.toSet());
if (companyDeptSetByCompanyId.isEmpty()) {
// 当前公司下没有部门

37
zt-framework/zt-spring-boot-starter-biz-business/src/test/java/com/zt/plat/framework/business/interceptor/BusinessHeaderInterceptorTest.java
View File

@@ -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<CompanyDeptInfo> 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<CompanyDeptInfo> 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<CompanyDeptInfo> 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<CompanyDeptInfo> deptSet = new HashSet<>();
deptSet.add(deptInfo1);
deptSet.add(deptInfo2);