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:10:38 +08:00
parent c1f12dfe5e
commit 71e63519ae
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
View File

@@ -11,7 +11,7 @@ public class CompanyDeptInfo {
/** /**
* 公司Id * 公司Id
*/ */
private Long companyId; private String companyId;
/** /**
* 公司名称 * 公司名称
*/ */
@@ -19,7 +19,7 @@ public class CompanyDeptInfo {
/** /**
* 部门Id * 部门Id
*/ */
private Long deptId; private String deptId;
/** /**
* 部门名称 * 部门名称
*/ */

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

@@ -15,14 +15,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.util.Collections; import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.zt.plat.framework.common.util.collection.CollectionUtils.singleton; import static com.zt.plat.framework.common.util.collection.CollectionUtils.singleton;
@@ -59,8 +52,8 @@ public class BusinessDeptHandleUtil {
if (companyDeptSetByCompanyId.isEmpty()) { if (companyDeptSetByCompanyId.isEmpty()) {
// 当前公司下没有部门 // 当前公司下没有部门
CompanyDeptInfo data = new CompanyDeptInfo(); CompanyDeptInfo data = new CompanyDeptInfo();
data.setCompanyId(Long.valueOf(companyIdHeader)); data.setCompanyId(companyIdHeader);
data.setDeptId(0L); data.setDeptId("0");
return new HashSet<>(singleton(data)); return new HashSet<>(singleton(data));
} }
// 如果有 deptId，校验其是否属于该 companyId // 如果有 deptId，校验其是否属于该 companyId
@@ -157,11 +150,11 @@ public class BusinessDeptHandleUtil {
if (extraInfo == null) { if (extraInfo == null) {
return; return;
} }
Set<Long> companyIds = infos.stream() Set<String> companyIds = infos.stream()
.map(CompanyDeptInfo::getCompanyId) .map(CompanyDeptInfo::getCompanyId)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toCollection(LinkedHashSet::new)); .collect(Collectors.toCollection(LinkedHashSet::new));
Set<Long> deptIds = infos.stream() Set<String> deptIds = infos.stream()
.map(CompanyDeptInfo::getDeptId) .map(CompanyDeptInfo::getDeptId)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toCollection(LinkedHashSet::new)); .collect(Collectors.toCollection(LinkedHashSet::new));
@@ -172,24 +165,24 @@ public class BusinessDeptHandleUtil {
private static CompanyDeptInfo convert(CompanyDeptInfoRespDTO dto) { private static CompanyDeptInfo convert(CompanyDeptInfoRespDTO dto) {
CompanyDeptInfo info = new CompanyDeptInfo(); CompanyDeptInfo info = new CompanyDeptInfo();
info.setCompanyId(dto.getCompanyId()); info.setCompanyId(String.valueOf(dto.getCompanyId()));
info.setCompanyName(dto.getCompanyName()); info.setCompanyName(dto.getCompanyName());
info.setCompanyCode(dto.getCompanyCode()); info.setCompanyCode(dto.getCompanyCode());
info.setDeptId(dto.getDeptId()); info.setDeptId(String.valueOf(dto.getDeptId()));
info.setDeptName(dto.getDeptName()); info.setDeptName(dto.getDeptName());
info.setDeptCode(dto.getDeptCode()); info.setDeptCode(dto.getDeptCode());
return info; return info;
} }
private static boolean applyAutoSelection(LoginUser loginUser, HttpServletRequest request, CompanyDeptInfo info) { private static boolean applyAutoSelection(LoginUser loginUser, HttpServletRequest request, CompanyDeptInfo info) {
if (info == null || info.getCompanyId() == null || info.getCompanyId() <= 0 if (info == null || info.getCompanyId() == null || "0".equals(info.getCompanyId())
|| info.getDeptId() == null || info.getDeptId() <= 0) { || info.getDeptId() == null || "0".equals(info.getDeptId())) {
return false; return false;
} }
if (loginUser != null) { if (loginUser != null) {
loginUser.setVisitCompanyId(info.getCompanyId()); loginUser.setVisitCompanyId(Long.valueOf(info.getCompanyId()));
loginUser.setVisitCompanyName(info.getCompanyName()); loginUser.setVisitCompanyName(info.getCompanyName());
loginUser.setVisitDeptId(info.getDeptId()); loginUser.setVisitDeptId(Long.valueOf(info.getDeptId()));
loginUser.setVisitDeptName(info.getDeptName()); loginUser.setVisitDeptName(info.getDeptName());
} }
request.setAttribute(WebFrameworkUtils.HEADER_VISIT_COMPANY_ID, info.getCompanyId()); request.setAttribute(WebFrameworkUtils.HEADER_VISIT_COMPANY_ID, info.getCompanyId());
@@ -201,7 +194,7 @@ public class BusinessDeptHandleUtil {
request.setAttribute(WebFrameworkUtils.HEADER_VISIT_DEPT_NAME, info.getDeptName()); request.setAttribute(WebFrameworkUtils.HEADER_VISIT_DEPT_NAME, info.getDeptName());
} }
CompanyContextHolder.setIgnore(false); CompanyContextHolder.setIgnore(false);
CompanyContextHolder.setCompanyId(info.getCompanyId()); CompanyContextHolder.setCompanyId(Long.valueOf(info.getCompanyId()));
return true; return true;
} }
} }