From 6ccb04d9bfb5cc638f221453d2b5b47039de9ddd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 20:20:17 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 52478da..d06a318 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -220,14 +220,14 @@
if (Objects.isNull(material)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佺紪鐮併�戞湁璇紒");
}
- if (Objects.nonNull(material) && Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
+ if (Objects.nonNull(material) && !Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佸悕绉般�戞湁璇紒");
}
QueryWrapper<Procedures> proceduresWrapper = new QueryWrapper<>();
proceduresWrapper.lambda()
.eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
.eq(Procedures::getRootDepartId,department.getRootId())
- .eq(Procedures::getOrgId,department.getId())
+// .eq(Procedures::getOrgId,department.getId())
.last("limit 1");
Procedures procedures = proceduresMapper.selectOne(proceduresWrapper);
if (Objects.isNull(procedures)){
--
Gitblit v1.9.3