From 4d94726acad17e5cdcf828e21cab762e8b39921c Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期五, 18 八月 2023 21:52:47 +0800 Subject: [PATCH] #字段结果 --- server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 4 +++- 1 files changed, 3 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..7347a46 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; @@ -65,6 +64,7 @@ insert.setProcedureId(salaryParam.getProcedureId()); insert.setMaterialId(salaryParam.getMaterialId()); insert.setDeleted((byte) Constants.ZERO); + insert.setType(salaryParam.getType()); if(findOne(insert) != null){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓墿鏂欏湪鐩稿悓宸ュ簭涓嶈兘閲嶅閰嶇疆鍝︼紒"); } @@ -205,6 +205,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 +216,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