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

Merge remote-tracking branch 'ztcloud/test' into dev

Browse Source
This commit is contained in:
yangchaojin
2026-01-21 17:33:45 +08:00
parent 6919fc3e7f c1ca1d5372
commit bbc1081a47
20 changed files with 1218 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,13 +59,15 @@ public class BusinessDeptHandleUtil {
}
// 如果有 deptId，校验其是否属于该 companyId
if (deptIdHeader != null) {
boolean valid = companyDeptSetByCompanyId.stream().anyMatch(info -> String.valueOf(info.getDeptId()).equals(deptIdHeader));
if (!valid) {
Optional<CompanyDeptInfo> matched = companyDeptSetByCompanyId.stream()
.filter(info -> String.valueOf(info.getDeptId()).equals(deptIdHeader))
.findFirst();
if (matched.isEmpty()) {
return null;
} else {
// 部门存在，放行
return new HashSet<>();
}
// 部门存在，先设置登录信息再放行
applyAutoSelection(currentLoginUser, request, matched.get());
return Collections.emptySet();
}
if (companyDeptSetByCompanyId.size() == 1) {
CompanyDeptInfo singleCompanyDept = companyDeptSetByCompanyId.iterator().next();
@@ -183,10 +185,10 @@ public class BusinessDeptHandleUtil {
if (loginUser != null) {
loginUser.setVisitCompanyId(Long.valueOf(info.getCompanyId()));
loginUser.setVisitCompanyName(info.getCompanyName());
loginUser.setVisitCompanyCode(info.getCompanyName());
loginUser.setVisitCompanyCode(info.getCompanyCode());
loginUser.setVisitDeptId(Long.valueOf(info.getDeptId()));
loginUser.setVisitDeptName(info.getDeptName());
loginUser.setVisitDeptCode(info.getDeptName());
loginUser.setVisitDeptCode(info.getDeptCode());
}
request.setAttribute(WebFrameworkUtils.HEADER_VISIT_COMPANY_ID, info.getCompanyId());
if (info.getCompanyName() != null) {