Commit d0d08948 authored by fangxinjiang's avatar fangxinjiang

合同自动化限制优化-fxj

parent 607183d9
...@@ -188,7 +188,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -188,7 +188,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
} }
TSettleDomain domain = tSettleDomainService.getById(tEmployeeContractInfo.getSettleDomain()); TSettleDomain domain = tSettleDomainService.getById(tEmployeeContractInfo.getSettleDomain());
if (Common.isNotNull(user) && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag()) && null != domain) { if (Common.isNotNull(user) && null != domain) {
// 超管放行,不进行自动化限制检查 // 超管放行,不进行自动化限制检查
if (!isSuperAdmin(user)) { if (!isSuperAdmin(user)) {
String deptNo = domain.getDepartNo(); String deptNo = domain.getDepartNo();
...@@ -1428,6 +1428,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1428,6 +1428,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
* 项目编码自动化校验缓存,key: deptNo, value: true-已纳入自动化, false-未纳入 * 项目编码自动化校验缓存,key: deptNo, value: true-已纳入自动化, false-未纳入
*/ */
private Map<String, Boolean> autoCheckCache = new HashMap<>(); private Map<String, Boolean> autoCheckCache = new HashMap<>();
private boolean notSuperAdmin = !isSuperAdmin(user);
@Override @Override
public void invoke(EmployeeContractVO data, AnalysisContext context) { public void invoke(EmployeeContractVO data, AnalysisContext context) {
...@@ -1440,7 +1442,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1440,7 +1442,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} else { } else {
// 导入时的自动化校验 // 导入时的自动化校验
String deptNo = data.getDeptNo(); String deptNo = data.getDeptNo();
if (Common.isNotNull(deptNo) && !isSuperAdmin(user)) { if (Common.isNotNull(deptNo) && notSuperAdmin) {
// 先从缓存中获取 // 先从缓存中获取
Boolean isAuto = autoCheckCache.get(deptNo); Boolean isAuto = autoCheckCache.get(deptNo);
if (isAuto == null) { if (isAuto == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment