Merge branch 'feat-20230531-unpack' into temp-pre

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

@@ -81,7 +81,8 @@ public class WmScorePackageStatusController {
 		page.addOrder(orderItem);
 		Integer userId = SecurityUtils.getUser().getId();
 		Integer deptId = SecurityUtils.getUser().getDeptId();
-		wmScorePackageStatus.setUserId(String.valueOf(userId));
+//		wmScorePackageStatus.setUserId(String.valueOf(userId));
+		wmScorePackageStatus.setDeptId(String.valueOf(deptId));
 		// 判断当前用户是否配置了团队负责人
 		List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
 				.eq(WmTeam::getDeptId, deptId)

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

@@ -139,7 +139,7 @@
 		left join sys_user u1 on u1.user_id = s.user_id
 		where  s.del_flag=0  and p.del_flag=0
 		  and p.typeid=4
-		  and p.source_type = '0'
+		  and (p.source_type = '0' or p.source_type is null)
 		<if test="query.id!=null and query.id!=''">
 			and s.id=#{query.id}
 		</if>
@@ -164,6 +164,9 @@
 				#{teamId}
 			</foreach>
 		</if>
+		<if test="query.deptId != null">
+			and p.dept_id = #{query.deptId}
+		</if>
 		order by s.create_time desc
 	</select>