|
@ -51,7 +51,6 @@ import com.epmet.dataaggre.dto.epmettduck.result.*; |
|
|
import com.epmet.dataaggre.dto.epmettduck.struct.*; |
|
|
import com.epmet.dataaggre.dto.epmettduck.struct.*; |
|
|
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; |
|
|
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; |
|
|
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; |
|
|
import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; |
|
|
import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; |
|
|
|
|
|
import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; |
|
|
import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; |
|
|
import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; |
|
|
import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; |
|
|
import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; |
|
|
import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; |
|
@ -71,8 +70,6 @@ import org.springframework.util.CollectionUtils; |
|
|
import javax.annotation.Resource; |
|
|
import javax.annotation.Resource; |
|
|
import java.math.BigDecimal; |
|
|
import java.math.BigDecimal; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.concurrent.Executors; |
|
|
|
|
|
import java.util.concurrent.Future; |
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Stream; |
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
|
@ -193,7 +190,10 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, |
|
|
} |
|
|
} |
|
|
orgIds = joint(pids,agencyId,gridList); |
|
|
orgIds = joint(pids,agencyId,gridList); |
|
|
}else { |
|
|
}else { |
|
|
String selfOrg = pids + ":" + agencyId; |
|
|
String selfOrg = agencyId; |
|
|
|
|
|
if (StringUtils.isNotBlank(pids)){ |
|
|
|
|
|
selfOrg = pids + ":" + agencyId; |
|
|
|
|
|
} |
|
|
orgIds.add(selfOrg); |
|
|
orgIds.add(selfOrg); |
|
|
} |
|
|
} |
|
|
}else { |
|
|
}else { |
|
|