From 8e1a9aa9e896f24f5244f042ecfb9e49effbe6bf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 21:27:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 4a22cda..ac6529d 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -46,7 +46,6 @@
@Autowired
private MaterialMapper materialMapper;
-
@Autowired
private MaterialDistributeMapper materialDistributeMapper;
@@ -205,6 +204,7 @@
wrapper.lambda()
.eq(Department::getName,salaryParamImportDTO.getDepartName())
.eq(Department::getType,Constants.DEPART_TYPE.factory)
+ .eq(Department::getDeleted,Constants.ZERO)
.last("limit 1");
Department department = departmentMapper.selectOne(wrapper);
if (Objects.isNull(department)){
@@ -215,6 +215,7 @@
materialWrapper.lambda()
.eq(Material::getCode,salaryParamImportDTO.getMaterialCode())
.eq(Material::getRootDepartId,department.getRootId())
+ .eq(Material::getDeleted,Constants.ZERO)
.last("limit 1");
Material material = materialMapper.selectOne(materialWrapper);
--
Gitblit v1.9.3