From 6c2d51a68d4dc59415d92fb8f60a16726d62951f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 21:59:21 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 13 -------------
1 files changed, 0 insertions(+), 13 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 355ca24..2c66aea 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -237,7 +237,6 @@
if (Objects.isNull(material)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佺紪鐮併�戞湁璇紒");
}
-<<<<<<< HEAD
if (Objects.nonNull(material) && !Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佸悕绉般�戞湁璇紒");
}
@@ -252,18 +251,6 @@
if (Objects.isNull(materialDistribute)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佺紪鐮併�戞湁璇紒");
}
-=======
- QueryWrapper<MaterialDistribute> materialDistribute = new QueryWrapper<>();
- materialDistribute.lambda()
- .eq(MaterialDistribute::getDeleted,Constants.ZERO)
- .eq(MaterialDistribute::getMaterialId,material.getId())
- .eq(MaterialDistribute::getRootDepartId,department.getRootId())
- .eq(MaterialDistribute::getDepartId,department.getParentId());
- MaterialDistribute materialDistribute1 = materialDistributeMapper.selectOne(materialDistribute);
-// if (Objects.nonNull(material) && !Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佸悕绉般�戞湁璇紒");
-// }
->>>>>>> 4d94726acad17e5cdcf828e21cab762e8b39921c
QueryWrapper<Procedures> proceduresWrapper = new QueryWrapper<>();
proceduresWrapper.lambda()
.eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
--
Gitblit v1.9.3