解决冲突

mitao

2025-02-12 84f28e6743089c1147e078763de6eafe52d0dc31

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java

@@ -16,6 +16,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.Objects;

/**
@@ -85,6 +86,7 @@
    @Override
    public void saveApplication(MwApplication mwApplication) {
        mwApplication.setAuditStatus(1);
        mwApplication.setCreateTime(new Date());
        if (Objects.nonNull(mwApplication.getDepartmentId())) {
            mwApplication.setRegion(sysDepartmentService.getRegionName(sysDepartmentService.getById(mwApplication.getDepartmentId())));
        }