feat: 团队管理-根据团队过滤任务列表、审核列表、积分包列表、小程序领包过滤

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

@@ -1236,6 +1236,7 @@
 		from wm_score_package p, sys_dept d
 		where (p.send_package_dept_id = d.dept_id and p.package_user_scope = '1'
 		and p.is_receive = '0' and p.enable_flag = '0' and p.enable_type != '2'
+		and (SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and FIND_IN_SET(#{query.zbId}, member)) = 0
 		<if test="query.scorePackageName != null and query.scorePackageName != ''">
 			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
 		</if>
@@ -1261,6 +1262,7 @@
 		or
 		(p.send_package_dept_id = d.dept_id and p.package_user_scope = '2'
 		and p.is_receive = '0' and p.enable_flag = '0' and p.enable_type != '2'
+		and (SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and FIND_IN_SET(#{query.zbId}, member)) = 0
 		<if test="query.scorePackageName != null and query.scorePackageName != ''">
 			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
 		</if>
@@ -1282,7 +1284,7 @@
 		)
 		or
 		(
-		    p.send_package_dept_id = d.dept_id and p.package_user_scope > '1000'
+		    p.send_package_dept_id = d.dept_id and p.package_user_scope >= '1000'
 			and p.is_receive = '0' and p.enable_flag = '0' and p.enable_type != '2'
 		    and FIND_IN_SET(#{query.zbId}, (SELECT member FROM wm_team WHERE id = p.package_user_scope))
 			<if test="query.scorePackageName != null and query.scorePackageName != ''">

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

@@ -58,9 +58,9 @@
 		/* 判断接单对象范围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 FIND_IN_SET(#{query.adminUserId}, leader)) = 0
 			or (p.package_user_scope >='1000'
-				and ((SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and FIND_IN_SET(#{query.adminUserId}, leader)) = 0
-					or FIND_IN_SET(#{query.adminUserId}, (SELECT leader FROM wm_team WHERE id = p.package_user_scope)))))
+					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>
@@ -148,9 +148,9 @@
 		/* 判断接单对象范围package_user_scope小于1000则是普通任务，大于1000则是团队发的包。如果adminUserId不是任何一个团队的负责人则可以查看全部；
 			如果adminUserId是团队负责人且是下发该包的团队的，则可以看到该包对应的任务 */
 		  and (p.package_user_scope &lt; '1000'
+		           and (SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and FIND_IN_SET(#{query.adminUserId}, leader)) = 0
 			 or (p.package_user_scope &gt;='1000'
-				and ((SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and FIND_IN_SET(#{query.adminUserId}, leader)) = 0
-					or FIND_IN_SET(#{query.adminUserId}, (SELECT leader FROM wm_team WHERE id = p.package_user_scope)))))
+			         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

@@ -979,9 +979,9 @@
 		  /* 判断接单对象范围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 FIND_IN_SET(#{query.adminUserId}, leader)) = 0
 			or (p.package_user_scope >='1000'
-			        and ((SELECT COUNT(1) FROM wm_team WHERE del_flag=0 and enable_flag=0 and FIND_IN_SET(#{query.adminUserId}, leader)) = 0
-			        	or FIND_IN_SET(#{query.adminUserId}, (SELECT leader FROM wm_team WHERE id = p.package_user_scope)))))
+				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>