feat: 接单对象范围筛选条件2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2559,23 +2559,23 @@ public class WmScorePackageController {
 		// 接单对象范围筛选
 		if (StrUtil.isNotBlank(packageUserScope)) {
 			queryWrapper.eq("p.package_user_scope", packageUserScope);
-		} else {
-			boolean onePersonScorePackageFlag = PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
-					&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2));
-			boolean multiPersonScorePackageFlag = PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(String.valueOf(packageType1))
-					&& PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(String.valueOf(packageType2));
-			if (onePersonScorePackageFlag || multiPersonScorePackageFlag) {
-				// 如果是个人承接-按积分值/多人承接-按积分值，判断当前用户是否配置了团队负责人
-				List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
-						.eq(WmTeam::getDeptId, sendDeptId)
-						.eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val())
-						.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
-						.apply("FIND_IN_SET({0}, leader)", String.valueOf(userId)));
-				if (CollectionUtil.isNotEmpty(teamList)) {
-					// 如果配置了，则只查询所在团队下发的积分包
-					List<String> teamIdList = teamList.stream().map(wmTeam -> String.valueOf(wmTeam.getId())).collect(Collectors.toList());
-					queryWrapper.in("p.package_user_scope", teamIdList);
-				}
+		}
+
+		boolean onePersonScorePackageFlag = PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
+				&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2));
+		boolean multiPersonScorePackageFlag = PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(String.valueOf(packageType1))
+				&& PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(String.valueOf(packageType2));
+		if (onePersonScorePackageFlag || multiPersonScorePackageFlag) {
+			// 如果是个人承接-按积分值/多人承接-按积分值，判断当前用户是否配置了团队负责人
+			List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
+					.eq(WmTeam::getDeptId, sendDeptId)
+					.eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val())
+					.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
+					.apply("FIND_IN_SET({0}, leader)", String.valueOf(userId)));
+			if (CollectionUtil.isNotEmpty(teamList)) {
+				// 如果配置了，则只查询所在团队下发的积分包
+				List<String> teamIdList = teamList.stream().map(wmTeam -> String.valueOf(wmTeam.getId())).collect(Collectors.toList());
+				queryWrapper.in("p.package_user_scope", teamIdList);
 			}
 		}