|
|
@@ -203,8 +203,6 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
|
|
|
scorePackageWrapper.in(WmScorePackage::getTypeid, "3", "4");
|
|
|
if (taskTypeConfigJsonDTO.getAssociateLower()) {
|
|
|
// 配置了关联下级，则同时查询'对应机构下发的企业承接的任务，再下发给个人的积分包'
|
|
|
-// scorePackageWrapper.isNotNull(WmScorePackage::getAcceptSug);
|
|
|
-// scorePackageWrapper.apply("length(accept_sug) > 0");
|
|
|
List<WmScorePackage> scorePackageList = wmScorePackageService.list(scorePackageWrapper);
|
|
|
if (CollectionUtil.isNotEmpty(scorePackageList)) {
|
|
|
// 遍历查找所有下级积分包
|
|
|
@@ -223,8 +221,8 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
|
|
|
.apply("length(accept_sug) = 0"));
|
|
|
List<WmScorePackage> scorePackageList = wmScorePackageService.list(scorePackageWrapper);
|
|
|
if (CollectionUtil.isNotEmpty(scorePackageList)) {
|
|
|
+ // 过滤只要发给个人的包
|
|
|
scorePackageIdList = scorePackageList.stream()
|
|
|
- // 过滤只要发给个人的包
|
|
|
.filter(scorePackage -> StringUtils.isBlank(scorePackage.getAcceptSug()))
|
|
|
.map(WmScorePackage::getId).collect(Collectors.toList());
|
|
|
}
|
|
|
@@ -262,6 +260,7 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
|
|
|
private void getAllLowerScorePackages(Set<String> ids, List<WmScorePackage> res) {
|
|
|
List<WmScorePackage> subList = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
.in(WmScorePackage::getRelationScoreId, ids)
|
|
|
+ .eq(WmScorePackage::getDelFlag, DelEnum.NOT_DEL.val())
|
|
|
.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val()));
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(subList)) {
|
