feat: 团队管理-删除多余过滤条件

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

@@ -162,8 +162,6 @@ public class WmScorePackageStatusController {
 		if(StringUtil.isEmpty(wmScorePackageStatus.getPackageId())){
 			return R.failed("未查询到积分包id");
 		}
-		wmScorePackageStatus.setAdminUserId(String.valueOf(SecurityUtils.getUser().getId()));
-		wmScorePackageStatus.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
 		return wmScorePackageStatusService.getPage(page, wmScorePackageStatus);
 	}
 

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

@@ -136,7 +136,7 @@ public class WmTeamController {
 		int packageCount = wmScorePackageService.count(Wrappers.<WmScorePackage>lambdaQuery()
 				.ge(WmScorePackage::getPackageUserScope, "1000")
 				.eq(WmScorePackage::getPackageUserScope, id)
-				.ge(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.IN_PROGRESS.val()));
+				.le(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.IN_PROGRESS.val()));
 		if (packageCount > 0) {
 			return R.failed("该团队还有任务在进行，不能解散");
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -1437,8 +1437,6 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		}
 		wmTask.setDelFlag("0");
 		wmTask.setRealFlag("0");
-		wmTask.setAdminUserId(String.valueOf(SecurityUtils.getUser().getId()));
-		wmTask.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
 		return R.ok(wmTaskMapper.getWmTaskList(page, wmTask));
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageStatusMapper.xml

@@ -55,12 +55,7 @@
 		left join wm_score_package p on p.id=s.package_id
 		left join sys_user u1 on u1.user_id = s.user_id
 		where s.del_flag=0
-		/* 判断接单对象范围package_user_scope小于1000则是普通任务，大于1000则是团队发的包。如果adminUserId不是任何一个团队的负责人则可以查看全部；
-			如果adminUserId是团队负责人且是下发该包的团队的，则可以看到该包对应的任务 */
-		and (p.package_user_scope < '1000'
-				and (SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and dept_id=#{query.deptId} and FIND_IN_SET(#{query.adminUserId}, leader)) = 0
-			or (p.package_user_scope >='1000'
-					and FIND_IN_SET(#{query.adminUserId}, (SELECT leader FROM wm_team WHERE id = p.package_user_scope))))
+
 		<if test="query.id!=null and query.id!=''">
 			and s.id=#{query.id}
 		</if>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -944,6 +944,8 @@
 		t.id AS id,
 		t.task_rule_id AS task_rule_id,
 		t.score AS score,
+		p2.id AS score_package_drug_id,
+		p1.id AS score_package_level1_id,
 		p.score_package_name AS score_package_id,
 		t.task_type_id AS task_type_id,
 		t.lookinto_date AS lookinto_date,
@@ -973,15 +975,11 @@
 		left join sys_user u on  u.user_id=t.task_user_id
 		left join sys_dept d on d.dept_id=t.dept_id
 		left join wm_score_package p on p.id=t.score_package_id
+		left join wm_score_package p1 on p1.id=t.score_package_level1_id
+		left join wm_score_package p2 on p1.id=t.score_package_drug_id
 		where t.del_flag=0
 		and t.real_flag=0
 		and t.task_status !='1'
-		  /* 判断接单对象范围package_user_scope小于1000则是普通任务，大于1000则是团队发的包。如果adminUserId不是任何一个团队的负责人则可以查看全部；
-		     如果adminUserId是团队负责人且是下发该包的团队的，则可以看到该包对应的任务 */
-		and (p.package_user_scope < '1000'
-				and (SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and dept_id=#{query.deptId} and FIND_IN_SET(#{query.adminUserId}, leader)) = 0
-			or (p.package_user_scope >='1000'
-				and FIND_IN_SET(#{query.adminUserId}, (SELECT leader FROM wm_team WHERE id = p.package_user_scope))))
 		<if test="query.scorePackageDrugId!=null and query.scorePackageDrugId!=''">
 			and t.score_package_drug_id = #{query.scorePackageDrugId}
 		</if>