|
@@ -3278,7 +3278,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
List<WmScorePackage> subPackages = this.list(Wrappers.<WmScorePackage>lambdaQuery()
|
|
List<WmScorePackage> subPackages = this.list(Wrappers.<WmScorePackage>lambdaQuery()
|
|
.in(WmScorePackage::getRelationScoreId, packageIdSet)
|
|
.in(WmScorePackage::getRelationScoreId, packageIdSet)
|
|
.eq(WmScorePackage::getDelFlag, DelEnum.NOT_DEL.val())
|
|
.eq(WmScorePackage::getDelFlag, DelEnum.NOT_DEL.val())
|
|
- .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val()));
|
|
|
|
|
|
+ .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
|
|
|
|
+ .ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
|
|
Map<String, Integer> relatedPackageScoresMap = new HashMap<>();
|
|
Map<String, Integer> relatedPackageScoresMap = new HashMap<>();
|
|
if (CollUtil.isNotEmpty(subPackages)) {
|
|
if (CollUtil.isNotEmpty(subPackages)) {
|
|
// 已分配的积分
|
|
// 已分配的积分
|