Merge remote-tracking branch 'origin/wb' into wb

cjl

2023-09-27 dc1c8c974d9469591ead4dd1d774bbfb97a33331

 screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java

@@ -16,8 +16,11 @@
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.AllocationService;
import com.moral.api.service.FileTableService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

/**
 * <p>
@@ -30,11 +33,11 @@
@Service
public class AllocationExtensionServiceImpl extends ServiceImpl<AllocationExtensionMapper, AllocationExtension> implements AllocationExtensionService {

    private final AllocationService allocationService;
    @Autowired
    private AllocationService allocationService;
    private final FileTableService fileTableService;

    public AllocationExtensionServiceImpl(AllocationService allocationService, FileTableService fileTableService) {
        this.allocationService = allocationService;
    public AllocationExtensionServiceImpl( FileTableService fileTableService) {
        this.fileTableService = fileTableService;
    }

@@ -63,6 +66,8 @@

    @Override
    public Page<AllocationExtensionPageExt> extPage(AllocationExtensionPageCond allocationExtensionPageCond) {
        List<Integer> unitList = allocationService.unitResult();
        allocationExtensionPageCond.setUnitList(unitList);
        return this.baseMapper.extPage(allocationExtensionPageCond.getPage().convertPage(), allocationExtensionPageCond);
    }