Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 8e1a9aa9e896f24f5244f042ecfb9e49effbe6bf

 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);