Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 c8df02a7b07086e17bacda6cdc015d76ac1f82fe

 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java

@@ -16,10 +16,7 @@
import org.springframework.stereotype.Service;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -45,7 +42,12 @@
     */
    @Override
    public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
        contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
        Integer unitId = SecurityUtils.getUnitId();
        Long uid = null;
        if (Objects.nonNull(unitId)) {
            uid = Long.valueOf(unitId);
        }
        contractScore.setUnitId(uid);
        return contractScoreMapper.selectDefaultScoreList(contractScore);
    }