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

Merge remote-tracking branch 'base-version/main' into dev

Browse Source
This commit is contained in:
chenbowen
2025-11-13 18:45:11 +08:00
parent 4efa894c8f c1f12dfe5e
commit 2eb09ff35d
4 changed files with 104 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@@ -155,9 +155,9 @@ class BusinessHeaderInterceptorTest {
setLoginUserForTest(loginUser); setLoginUserForTest(loginUser);
boolean result = interceptor.preHandle(request, response, handlerMethod); boolean result = interceptor.preHandle(request, response, handlerMethod);
assertFalse(result); assertTrue(result);
// 可选：verify(request).setAttribute("visit-company-id", String.valueOf(deptInfo.getCompanyId())); verify(request).setAttribute(eq("visit-company-id"), eq(deptInfo.getCompanyId()));
// 可选：verify(request).setAttribute("visit-dept-id", String.valueOf(deptInfo.getDeptId())); verify(request).setAttribute(eq("visit-dept-id"), eq(deptInfo.getDeptId()));
} }
/** /**

3
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/oauth2/OAuth2TokenServiceImpl.java
View File

@@ -203,9 +203,6 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
.put(LoginUser.INFO_KEY_TENANT_ID, user.getTenantId().toString()) .put(LoginUser.INFO_KEY_TENANT_ID, user.getTenantId().toString())
.put(LoginUser.INFO_KEY_USERNAME, user.getUsername()) .put(LoginUser.INFO_KEY_USERNAME, user.getUsername())
.put(LoginUser.INFO_KEY_PHONE, user.getMobile()) .put(LoginUser.INFO_KEY_PHONE, user.getMobile())
.put(LoginUser.INFO_KEY_COMPANY_IDS, CollUtil.isEmpty(user.getCompanyIds()) ? "[]" : JsonUtils.toJsonString(user.getCompanyIds()))
.put(LoginUser.INFO_KEY_DEPT_IDS, CollUtil.isEmpty(user.getDeptIds()) ? "[]" : JsonUtils.toJsonString(user.getDeptIds()))
.put(LoginUser.INFO_KEY_COMPANY_DEPT_SET, CollUtil.isEmpty(user.getCompanyDeptInfos()) ? "[]" : JsonUtils.toJsonString(user.getCompanyDeptInfos()))
.put(LoginUser.INFO_KEY_POST_IDS, CollUtil.isEmpty(user.getPostIds()) ? "[]" : JsonUtils.toJsonString(user.getPostIds())) .put(LoginUser.INFO_KEY_POST_IDS, CollUtil.isEmpty(user.getPostIds()) ? "[]" : JsonUtils.toJsonString(user.getPostIds()))
.build(); .build();
} else if (userType.equals(UserTypeEnum.MEMBER.getValue())) { } else if (userType.equals(UserTypeEnum.MEMBER.getValue())) {

2
zt-module-system/zt-module-system-server/src/test/java/com/zt/plat/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
View File

@@ -81,7 +81,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
assertPojoEquals(accessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted"); assertPojoEquals(accessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
assertEquals(userId, accessTokenDO.getUserId()); assertEquals(userId, accessTokenDO.getUserId());
assertEquals(userType, accessTokenDO.getUserType()); assertEquals(userType, accessTokenDO.getUserType());
assertEquals(6, accessTokenDO.getUserInfo().size()); assertTrue(accessTokenDO.getUserInfo().size() >= 6);
assertEquals(user.getNickname(), accessTokenDO.getUserInfo().get("nickname")); assertEquals(user.getNickname(), accessTokenDO.getUserInfo().get("nickname"));
assertEquals(clientId, accessTokenDO.getClientId()); assertEquals(clientId, accessTokenDO.getClientId());
assertEquals(scopes, accessTokenDO.getScopes()); assertEquals(scopes, accessTokenDO.getScopes());