feat: 团队管理-积分包去掉teamId

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

@@ -15,7 +15,6 @@ import com.qunzhixinxi.hnqz.admin.entity.base.BaseEntity;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.WmTeamExcelModel;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
-import com.qunzhixinxi.hnqz.admin.enums.PackageUserScopeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
@@ -125,8 +124,8 @@ public class WmTeamController {
 	public R<?> dissolve(@PathVariable("id") Integer id) {
 		// 查询团队是否还有任务在进行
 		int packageCount = wmScorePackageService.count(Wrappers.<WmScorePackage>lambdaQuery()
-				.eq(WmScorePackage::getPackageUserScope, PackageUserScopeEnum.TEAM.getVal())
-				.eq(WmScorePackage::getTeamId, id)
+				.ge(WmScorePackage::getPackageUserScope, "1000")
+				.eq(WmScorePackage::getPackageUserScope, id)
 				.gt(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.IN_PROGRESS.val()));
 		if (packageCount > 0) {
 			return R.failed("该团队还有任务在进行，不能解散");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/PackageUserScopeEnum.java

@@ -1,23 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.enums;
-
-/**
- * 积分包在接单用户中的可见范围
- *
- * @author lixuesong
- * @date 2021年12月08日 16:58
- */
-public enum PackageUserScopeEnum {
-
-	// 可见范围：1-仅内部可见，2-全部可见，3-团队内部可见
-	INTERNAL("1"), ALL("2"), TEAM("3");
-
-	private String val;
-
-	PackageUserScopeEnum(String val) {
-		this.val = val;
-	}
-
-	public String getVal() {
-		return val;
-	}
-}